diff --git a/FaceUnity/build.gradle b/FaceUnity/build.gradle index 23ed7d11f..4d0686f41 100644 --- a/FaceUnity/build.gradle +++ b/FaceUnity/build.gradle @@ -33,7 +33,7 @@ android { versionName rootProject.ext.android.versionName manifestPlaceholders = rootProject.ext.manifestPlaceholders ndk { - abiFilters "armeabi-v7a","arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } aaptOptions { @@ -54,7 +54,7 @@ android { } repositories { flatDir { - dirs 'libs','../libs' + dirs 'libs', '../libs' } } dependencies { diff --git a/FaceUnity/src/main/AndroidManifest.xml b/FaceUnity/src/main/AndroidManifest.xml index 7d49364e3..220544321 100644 --- a/FaceUnity/src/main/AndroidManifest.xml +++ b/FaceUnity/src/main/AndroidManifest.xml @@ -10,6 +10,7 @@ diff --git a/FaceUnity/src/main/assets/animation/animation_data.json b/FaceUnity/src/main/assets/animation/animation_data.json deleted file mode 100644 index b7a3af2a2..000000000 --- a/FaceUnity/src/main/assets/animation/animation_data.json +++ /dev/null @@ -1,6469 +0,0 @@ -{ - "v": "5.7.3", - "fr": 30, - "ip": 0, - "op": 83, - "w": 202, - "h": 244, - "nm": "精品贴纸- icon", - "ddd": 0, - "assets": [ - { - "id": "imgSeq_0", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMoAAAD0CAYAAADaFbl1AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAAA1klEQVR4nO3BgQAAAADDoPlTn+AGVQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AwDQQABuUTdfAAAAABJRU5ErkJggg==", - "e": 1 - }, - { - "id": "imgSeq_1", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMoAAAD0CAYAAADaFbl1AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAABHklEQVR4nO3VMQ7CQAxFwe+IFNz/tBTEFHCBNOtEzEjun2ytNgEAAAAAAABgre6u7q7pDtZ4TAfcTXdvSeo3R5KeLWKFbTrghrYke5K9qo7pGNbwUM7rJM/Y3V9x7JOq6p3vj/KabgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBr+wBxwA8aMZdeyAAAAABJRU5ErkJggg==", - "e": 1 - }, - { - "id": "imgSeq_2", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMoAAAD0CAYAAADaFbl1AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAACiklEQVR4nO3avW5cVRQF4LUNjo3/I9HwBPTpaBAVT5GXyAulTeOC1qRLkwhEkSIIgURBDYWhi2LvFPcOM3JACkhwxr7fJx1pfpqlK63Z59y5CQAAAAAAAMC/VKMD3Hbd/ec1rKoemYX/jqL8Q5vFyLvXr5XlblKU9/A35ejEFFmKD0cHuEVqY10pyLLsjA6wbbp758YESaZyfJDph8X2aoEUZUN372Qqw19N2t0kqaqr/zUUW0FRZvMU2Z/X0Y27WdeZJsrrQfEYzBllbS/JQZJ7mcpyleT31ZdV9cegXGwBd72SdPdeko+TfDSvgyTXSb6bpwkLt9iizOeR/SQnSY4yleMwyfHGepPk2yQ/OsAv2+KKMhdkVYjV9Dia359mKs7JxuvjJL8l+aqqXozIzHhLLEolOUvySdalWBXjbF6bn6+mzUGSZ1X1aEBsBltcUVa6ezfJp0keZDqf3M9UktOst15HmbZnL5OcJ7moKne+FmixRVnp7uMkD5N8lvUUOcx06/xJkvOq+mVcQtgS3X3a3Rfd/U13v+run7v7y9G52B7+cExSVZdJvs96C/ZTVX09NhVsoe7+ort/7e7L7v58dB7YSvPDkD9099PRWdg+HmGZVdV1dz9O8nx0FgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4694CTRODih0VhXQAAAAASUVORK5CYII=", - "e": 1 - }, - { - "id": "imgSeq_3", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMoAAAD0CAYAAADaFbl1AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAADfElEQVR4nO3au6odVRwG8G/OxRPvIMRLZ28pKBLRzsIUgtoKvoLPYNDeSnwDG5/AwgcQwSLaBYKKIeQiXjCXk/NZ7DnnDNvEWJ3Zyfx+sJi9157iz8DH+q9ZOwEAAAAAAAAAgFkNcxfwoGl79MyGYeictXByBOV/mIZjNA3LwQmXwwwE5T+sBWT98zQs+ydWFLPYmbuAB8AwuR6uHp3Otx20YQ83QVnTdis5aqm2DueHYbizfutJ1sW8tu5/y3KMIXkkyfbYdh2GZj0kLMz23AVsijEkjybZHaf2k9RmnUTrleQoJI9n9Tx2kmwPw/B3tFeMFheUsaU6HNvjOJXVs9gdr/tJrs9VI5tnUUEZV47dHAdkZzJ2JyNtf/Umi0OLO0dpu5NVmzUNxk5Wm/jpqnItyQVhIVlgUJKk7W6SZ5Ps5d+BOdqnJLma5LwNPYsMSpK03UvyYo7fdE0Dsp3Vq+GtrPYq3zl9X7bFnqMMw3AzqxCcGsdeVu3XemhOJ3ntLv/3YkEWtZm/i9tZBWQnxyvIb1kF6EaSm+P1hr3Ksi0qKG2fTrI3DMPlcepWVqvIYUguDsPww1z1sbmW1np9lOTdyfdbOd6TXBIS7mUxQWn7RpJ3krx9ODcMw+3x45Uk389RF2yMtk+0/abtxbaX2z43+e2ltv7zBm0/bvtL26tt/2j7wdw1wUZou9325baftr3U9nrbv9rebPvV3PXxYHmozgbaPpnklSRvJnkryQtJHsvxK+DpQeK5JJ+M5ymwHG3PtP267Y9tf257ZWy1brS91Xa/7Z22B+M43/bM3HXDiWt7uu0Xba+1/XNstW6PAZmG5KDHPh/PWGBZ2p5te2ESkoN7hKRtv2373tw1wyzG1eXiXULye9sv237Y9vm564TZtT23FpLzbZ+Zuy7YKG1fn7RaB21fnbsm2Djjecr1MSifzV0PbKxxP/JT26fmrgU2Vtv3256duw4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOB+/gGp78J5A6UmWgAAAABJRU5ErkJggg==", - "e": 1 - }, - { - "id": "imgSeq_4", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMoAAAD0CAYAAADaFbl1AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAAFNklEQVR4nO3cu6tlVx0H8O+688xDwqhRCAo24gttjCE+IBFHfBQ+QASFWFmI2AgKFlqI/4FoI6YQBK1sLFSwEQ1ICtMNFikMaKeJUZPBzNz5Wux9kjN37tyZCHP3ued8PrA5z+K3D/u711p7rbMTAAAAAAAAAAAAAHZL29F2LF0Hx+/00gVsOsEgSRwEN3FIQK57Pca4dozlLK7tGGN06TqWokU54BYtyE6eWObfZLTNroZFUI5w4KDo6oBJstd2b8dalb0k+0sXwYZoe6rtqdv43la0LvP+3nJf2u4dRz2baqd3/qC2Z5KczW38LlvUBflckkdv9aUdaz1vsFNdr/Uz5/qBPrcgZzIFZC/JleOv7vjN+/1Ykv+0/f0Y4+rSNW2qXWtRRpJTSU63Pdv2XNvzSc5lOmmcmrddOXt+NMk7krwnyScWrmWj7VpQmnkwnldCsR6QU0l2aZD+lST3JbmQ5Btz15ND7FRQ5u5WMwfikMe9+fOt1nav7VeTfDzJXUnuSfLuJD9p+65Fi9tQW3Hl5tVqe3emlmQv02+wviXJs9vYqsxXrj6f5DtJ3p7ppHBtftyfn19J8mSSx5P8coxxeZlqN8uuBuVsprPoYSEZSf47xnh+ofLuiLYfTvLDTAG57qMD236Sq/P24zHGN4+zzk21U12vNatxys1alPNtzy1U253ypyQ/SvLnXH+CXP8tVmO23yS5KCSv2NUW5Z5MffP1cOTA8/0k/9ii+ZKXtX00ydeTfCrXj8meSvLlMcZTS9S1yXY1KPdlmlhc7f+LmfrmqzPqars8xvj3IkUeg7a/SPLZ+eW1JG8bYzy9YElsgran27657evavqHthbY3nXTdlmUqN9P2nW2vdfKrpethA8yTix9s+3Db+9vetXRNm6Dtz+egfGbpWlhY27vbPtL2k3NQdvUixg3mVuWZo1pWdmCt1zweeTDTMpWRZGzjHMn/a4xxqe0j1nkdbWuC0vZCkgcyDdJXy1JW8yWrFmRkWvzImjHGX5auYdNtTVCS/DPJmzKtW3p53VZuvASs28WrtjUHzTzfcSnTpd7DQrJ6fm/b1y5SJCfW1gQlScYY+5lmoC/nxpBk7flDbV9zzOVxgm1VUJJkjPFSpkV9qxnnw+ZCziR52CVibtfWBSVJ5hWvz+folQfnk7x/XiAJR9qmwfxBB9do7Sd5NtffSWQ/yf1J/nZcRXEybU1Q5pbhsTHG44d8/GKSP44xXjjmstgS29T1+l6S7669Xt0g4l9JnhASdl7bi2335wV+b5nfe9+8tssEI7R9fdu/ziG51vYL8/tvvJ0b2cHWmxc7/notJNfa/mDputg+J2owP/8z8cEkH5i3D2W63c66izt4X2CYtP1i2+faXm77Utura+OS1bby07b3Ll0zLKLtl+awHBWSlafbPrR0zbCItm9t++QtQrJype23/FGLndT2TNvv3yIkK5fafmzpmjnZTuzNE+ZW4plM/0FZ94ckv0vyRKbZ+OeOuzbYKG1/dqD1+PbSNcHGafu1tZD81lgEDtH2vXNI/t72gaXrgY3U6YZ2L7T99NK1wEZr+5GlawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADuvP8Bl+6iPXcFJh8AAAAASUVORK5CYII=", - "e": 1 - }, - { - "id": "imgSeq_5", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,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", - "e": 1 - }, - { - "id": "imgSeq_6", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,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", - "e": 1 - }, - { - "id": "imgSeq_7", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,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", - "e": 1 - }, - { - "id": "imgSeq_8", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,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", - "e": 1 - }, - { - "id": "imgSeq_9", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,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", - "e": 1 - }, - { - "id": "imgSeq_10", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMoAAAD0CAYAAADaFbl1AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAAHSklEQVR4nO3dy48c1RnG4ffrscdjGwxxkB2Li4BIEVKCjDFRwgoJWAASGyQW7LhJ7NiGdSQEUrIJIko24W9AUbLPKgpYKFEWgBQS7iANCJC5zMUz87I4pzLlct/G7lM13fV7pFbPTFWPv+lT37lXWwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACA/Si6DgC4UrYvuo4jwrP+Nwaz/oV9Ypv3b/8IFaz4aVGugO2DSu/hVkTsdB1P31UtS4kWhUS5ArYPSFrK327nh7Rbuw0k7UTE9pCXo4BSyXJglr+sh+qFsaTdpKnbaikWqExrIrUwRrEdtoddQItgUndrq1TBoV1FEyU3gwP1s4tnulyLo1ii5CSpEmRRa9VxLSVdrgVSJFEaSbKQ8t+4qF1KNLAOcPkmTYQsdEXRJttLe1mzai5AzgKzXpchF9pAaTDv2mNJu5XPQLvTxbgyByRda3tD0rqkjeYkSZ4wGiiVQ1UuMw2gDWE7FmUGKC8ubgw5tJMLbEm0KDMTERu2dyQdkrQsybbXlcpgoPR+W7trWXO9heVAiSZxv4mI7YjY1OSpY+zNWu3rUEqaqyStqHEdL8Jer9509SKCWa/ZWpt8iqRCM6xtJ0rkbR/AnuQ1qWHd3Uo1TizSkpdMlHrgVd9xS3O8ppJnX67uOo4eW8/PzWvo/9+XGgcXq92HBLzvE8T2YaX3ZFPSZvU35AH6UUmH8zF0Y9gYtzn7VWTSaOaJUm1bsS2lP2xnjragb0o6JumIJNm+oFQQy41z0I2VKc4JzdmsVzVtNzeLmrkfXB80HtTFSSKRKJ3IrfrBKU4tMrNa6iKuxiebczj78+2YY46IC61FgroVXZoE1XWm2nORlfliiRIRc7nFfNLsSh/Wgrpi+8yYWzLq3a4Lkr6OiC8lfa00yJ/5anzdzMco85gcQ4waU4VSgU07p48p5QS5QdKy7XP1cW1eUhgotfZr9dsX8vW2lc8rVonNzfihZc1xSd1RWpUiDuXnE5LuaLzH25I+j4hvxt3jExGuHrMOjkRpqO3Vquzo4ntLlpSmiTFb9a7V9ZJ+Vn1T6uLfC1bJL1W1JttKTf16RDjXcMu1x3cdxbeomlO/NzutMfxPqbvVaaLQhWiwfVRpUNh54fSJ7VtUa0Xqh/LzhtLYcE2pkno3ItaHnF9E71sU24P6wDEixk0Po5wfTji+rLSOckTS+TaTROr5GCWPR35p+9quY+kz2z+RdGqaUyW9ExH/KRzSJXrbouQxx1mlmuzQhNNRiO2fSrp1ytPfjIj3S8YzSm8TRdIZSSfz19PsIcIM5YrqtKQbx51We/5XRHxcPLARFj5RcvfqsFKrsZKfT0q6rnYaLUqL8mcOnJX0oylf8mmXSSL1IFGUulY/1/jxGPeYtGsgaVXSee1WXiu1r5vOtxfacAufKBGxavucpLs0+nO4Ttk+FRGfthhaL9k+KenXEfHMiOOnJN2pi5cuxt3Z2IpezHpFxKqkf2j0pzeGpLO2b2ovqt56QdLjto8NO5grq3/WfmTt3tnYmV4kiiRFxBeSXht3iqTTtn/cUki9Y/sXkp5QWhN5aNR5EfGJpH/XfkSL0qacLMO2nmwqbdf+TNIx2+M2ReIy5AH8y7UfPTru/Ij4QNJb+dvOE2XhxyhDbCjf6ivpC0lvtL3K21NPKo0TKw/YPhwRI29ZiIj/2t7WPrirtFctSlYlxXlJr5MkZdke2H5A0m8bh45IenjS6yPiPfbcFWD7Ttv3jDl+u+176V6Vkz/W6T7bL9v+xKN9mMctaJvt39l+e1Qi2D6RP5YIM2b7B7b/ZPuzMcnRtGP7Fdsnuo6/V2y/nwvgua5j6Run/4bwadure0iUKlm+sv2s+STR8py6XZVvbY/bR4RCcsvyku2tPSTKju1t22/YZktRSbZ/0yiAc7bvNve4d8JpPPi3KZJk3fafbT9p+3jXcS8s2wdt/yrXSMN8ZPv3tu+3Pc2HqGFGnLpjr44ol7/afsz2NV3HufCcZrDenFBrVT60fbbrmPvGaQas6Q9dx9Ubtv84ZYJs2n7R6X54tMxpuvjzWnmsmrtK22P7uO3HnZr2tRFJ8nfbt3Uda985TRtXnuo6nt6yfcT2M7n1qGzYvm7yq1Ga7QdzmbzmPfwPvyjE9vO1RPlL1/EgsX3I9pdmJX5/yC1Ltej4dNfxYJftM13HgBrbjzhNFbMtAhjH9tBbTQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwDz5HvsRnC7yay96AAAAAElFTkSuQmCC", - "e": 1 - }, - { - "id": "imgSeq_11", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMoAAAD0CAYAAADaFbl1AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAAHuklEQVR4nO3d3Ytd1RnH8d8zL8nkVayvMZJSrSGKxjfsRcGS2l5Ii9CCFCpeeNm7gu1V6XV7UcSbUvEPEBR7UxDEO2lvFSsVS2nRSkuJSaqNyWQmmcz8erHWzuwzs8+co85+O/v7gcPJ7LOGeTJ7nr3Ws9ba50gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHSQ7Xnb0dbPn2vrBwOf05ykxbaShURBn4RSsjT+d0uioG9C0kLTybLQ5A8DdkmRLBuSNvIxX3sxwpXf9SWQKOizOaWk8ZZHLT8I6IOqIr6WpKhComS2o83pR4xne16jiTIuQVzHsEsiUcpC0p58UtAR+XxMUyLUliRSdXf2pRVX5joDr4PtvcU/Ja0rFYqhdEGZk6SIuNJOdMOTZ7YWq14qPVspSdbrjKXWYt72XERsTG7ZGVZKjFD17+Zqs+EM1w5JUtm8zlikGhMl9ya96lGUepBxQ6/ar1oYMa/qv59W6shaEqVvQ66SneKmN2mA7cOSLkbE2pjXi96+0YShmB81tpDv2RCyl2wvStonaWlcm4hwTqJGzweJkuUx8dirFFPHjTiYn/dNahgRV9VgspAomyYNQ0mUGtneI2lP/nLB9sSyINeMjSQLiaKRBa1iWngtP8ongd9VvQ5u+XpiryKlIXETw2L2eiUbEXG56ngekjVePA6J7f3aPhW8ZPtiVyaGOPlT6uGaUKflC9CSUs8x7oJ9RdKFXI+0avCJQgI0K+9+2Cdp76S2JatKU8atrWMNNlHyLNYhSYqIz1oOZxBywX6dvli9Z0krkpbbuLANskDNJ+wGpSsbq+0Nyfvkzkm6qM+3a6Nou1c7rLHUaaaLedsHJe1XSobiMa/Rbp9EaVAuzpdtryidm/2aPLJZU+pNLrdV3M/00CsPr27QDivukj5lR3B78tT89dp+jizpkqSVLuyxm+mhV776nJ/QjEK+RTkJliteWo6IVgv4splOFEnK+4Iu7dCklTHvkNlesH1H6dCqRmuWde18zho384mSVV2xCgfyZjw0wPYhSd+SdLQ4lnv+8oLvclcWGgtDSZRJtdhhNj3Wz/ZRSY9KOqBUoJet5Of1iFhRx8z0rFfJ1kJxXen+kvn8WFDaa3Sh4bhmSt6Ksrb1XpK8Cn+PpK+VDo+stkfEFdvrSlPHnTO0RLFStz4yFJu0xR6T5R75EaXeWUqJUGwuXdLmzuBC1Y1Z58fdsNW2mRt62b69Yhg1r3TiPtmaJNK1HaidmF3pq1xTvKXNBFhQWtA9rO1JIlUkSleTRJqxRMld//1KaydlqxHx3y5srptl+SL0Tttx1GGmEkXS3Ur/p6PlgyRIcyLiY0l/n6Lp0byVqBdmJlFsXy/ptvzlkTY+GgDX/E1pT9dOliQ91JfZxpn4Y7K9T9LJ0qFFSbe2FM7g5Xplml7lJknHaw5nV/R21ivfU31EaZh1o7bPWp3Mbf7VtcWrgZh2a9Bx2//LQ7bO6kW3t5XtWyU9rOl6xM8kvR8RZ+uNCmW2b5H0jYqX1pRmIYtzZ6UZyT9GRKe2rZT1MlEkyfbNSotYh6b8lg8j4r0aQ0KJ7dslPVg6tCzpreImudJbphaP5S7v4u7t0Csiztg+K+mYpBOqnqu/Kum0pH9rcnGJCWyfknSHpJfGvBlHWXn/3GlJ75RnH/Ndipc1users3rbo5TljXanyockvadUn7CQuEtsn5T0rqQzkn4r6YWIOLelzV5Jj0l6RqlH+V5E/KPhUDGO7W/afiI/7m07nlll+wNvWrH9ou1Ttp+y/bLt86XXf9V2vINh+yu2fzJpvt32sZwkj/dpIatvbD/n6azYvrHteAfD9nW2P7H9h1zAj2u3aPv7tr/eZHxDY/vRKRPlxbZjHRzbH+Uu/UPb3y0dX7B9m+0Hc6IcNyvytbI9Z/vMFIlyou1YB8f2n2yftX3B9qrtf9o+bXsjP/5qm1t6G2L7tQlJ8kbbMe62vkwPf6Q0DVzcN3JEm5/IdEXSjyNitb3whsOp/ntoQrMPmoilSZ1PFKe3szmotGC1oM0PHi0+hPTnEfHn9iIcnB8pXah28p0mAmlSH8bzT+Tn80rJsqq0DWJd0uuSftdSXEP1syna3GX7ntojaVCnexSnNyO4X2lVfVHbe5RX2fDYHNuPSXpgmqaSfijp/Xojak5nexSntxC6T9JZpZXgc5I+VdrkeEmpZ5nqw2awa57NzxuS3pT0U0l3SrpF0i8k/Ueb78/1g6aDGyTbh2zfaftu2/faPmH727Zfsf1unvn6ZdtxDoXtA7Z/b/sZ21tvtS7a7LH9tO23ba/bPtZ0nMhyAv3a9l9s/6bteFAtX9S+2nYcg2Y7bD9p+/m2YwE6L08dAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF/Q/wHnvoriekCjMAAAAABJRU5ErkJggg==", - "e": 1 - }, - { - "id": "imgSeq_12", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,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", - "e": 1 - }, - { - "id": "imgSeq_13", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,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", - "e": 1 - }, - { - "id": "imgSeq_14", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMoAAAD0CAYAAADaFbl1AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAAErUlEQVR4nO3c22okRRgH8H+NG1fRVcEDKIKgFyJeCooP4Gv4Cr6AD+mF4LUHvFBEdLNmd5PM50X1ZHqzm2Q8ZA7dvx80c8gQag7//qq6qjsBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAmK+qWlTVYtft2JbZvFH+P0NAjpK0XbdlW/Y+KFU1my/jEIxCkgjKfhi+lOd23Q66Yad1NHpKUPZESy4Cww5dqiSzc2fXDdjQIsly142Yg6p6LusdaMv1VUNF2bWhzNewqSrbU+kBWOTmILS5jCEP4ce3Csuiqu4IzO1qrS2TnGbYQW3gUHol/8ne7g1Ge6rx7bgrsGytnW+9YTMxGrhv8hupJKettU3DdXD2du88+tDHH35d2rglw+e/aWVpSY6m3A3b2zf2jA999bimvOfaN//waNdkK8te9y9bazUKjIDsxnU703HVX91vmWC139uKMlZVTUi2azhM/GqSkzx9aH7ZWjvdfqt2Z2/HKOOul5BsV1W9mOT19C7X7EOS7HHXSzhux1Apkv6Dr0t/WyR5Jcnd0dPnWc+pzDIkyR4HhVtzlN6lSlUt04OwTB9XPJ+nexnLDOOOuYYkEZTZaa09rKoX0qvGItd3v6u1thzGiLOes9rbMQq36s9stnZumSRzD0kiKLM0LFP5Y4OXLqY8ifhPCMpMtdYeJ/nrppclubeF5uw9QZm3Bxu85oWqunvzy6ZNULjKeLb93txXbc/6zZM3k3yeJ38Hlxecru6/vK1G7SOHh2eoqo6SfJTkg6zPHl0F4kH6quHVyVurrVXVndba2fZbvHuCMjFVdSfJh0nuJzlOcn88UVhV7yT5OOvZ9/vpITlP8sdcg3ATQZmY1trZsFbr/dVzVfUwPTRH6UtULs4aTa8gJ0mOLRu6mqBM07dJ3sj6+72bvjwlWXezVidm/dRau7/1Fh4Yg/kJaq09TPJd1oFYDtv5aDtLrzK/76iZB0VQpuuHJL/l6XCcpVeSx0kexWWgNiIoEzWMN77Nk8E4TQ/Hw9H25q7aeEgEZdoeJPkifRnKo/RB+yogJ+lLWI6q6qWdtfBACMpEDctOvk7yWXr36iTrcKy21eOXLH68nqNeE1RVryX5Ksm7SX5M8kt6IC6PV8aP76ZXGp5BUCamqt5O8uXw8Pv0uZM/04OyOtL1OOvTey+umuIiHlcTlANUVZ8k+TTranCcHoJK8lb60a5HWQfhOD0sx8O5KM/6n0JyDUE5TN8keS99UnGZXjVWE4g/pleMVdU4S/LrMLdyJSG5ngHcgaqq59MH6kfpATm7dHuaHqLHSX62huu/EZQDNhzZei+9mlwenI8H7aettZNdtXMKBOXADZXlXtbLVMZbjW7PrxqfcDNBmYDh/JJFnn21/4v7xiH/nqBMwDBZeHEx89XzggEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE/6G6t6hzgTaFVIAAAAAElFTkSuQmCC", - "e": 1 - }, - { - "id": "imgSeq_15", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMoAAAD0CAYAAADaFbl1AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAADDklEQVR4nO3cXW8aRxQG4Hf8mTZRe5P2qv///7Vq0tgGTi9mgA0BG0uRMcvzSCtYDNbI7LtnPnadAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8oKraqdsAXKiqak5Cr3d16gbw5lqSu6q6eSkwI1TXb9Sud82Z5QJV1f1kd5Vk0Vqr8bOr9BPoVfrxsWqtPb19K9+Xm1M3gJNYZdubuEqvMJX9J87lm7XqHdP1ukyrPa/tC8mqtbbvvRdHUC7TsQe/ajIIygUa45F64W2lmmwJCocIyYSgXKAxs2XG8xUE5TIdszbi2Jjwx5ihqvp4aKFwsk5y8ONjcxnRhKDM022Sz1X1e1XtrpVd7zy/T++GLfL9AL/i+Niw4DhPD+kB+JDkQ1U9JPmSPt17n/6936QHpJJ8aa0tkywnFafFOGZDUObpcTyuK8Td2KavrbtYDyMkSZIxJbwa3S4VZRCUGWqtLatqkW03q555/Hrgd1QsOG4Iynw9JPkl+8Ox3h6n1YTDBGW+ntLHI/sCkvQFxW8naNdZEpT5uk4PQ+XHkFSSpUtUjicoMzRmrm7SxxiVHpr19O+0onAksxrzdJsekrskfyT5NPaX6QFZZjuzxRFUlDNUVX+mH/z/ju2/yR2KLcmvST6mB2aR5J983w3LeGyTfZ7hjHKGxuUpf43dVbYD88f0Rca78doivXr8PfZ3v+9aB4znCcqZqqpP2U7/TqtFy6R7lX6X4redz26+d0E5jq7X+fqaHorb9DWT3dmt9fbDOolwvJ6gnKnW2qqqnpL8ln4d13oWa3ccIhQ/gaCct5btQH1aOTbhUD1+DmOUM7VzX8l6jCIYMOVfowIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAO/4HVObuJ+2YzhoAAAAASUVORK5CYII=", - "e": 1 - }, - { - "id": "imgSeq_16", - "w": 202, - "h": 244, - "t": "seq", - "u": "", - "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMoAAAD0CAYAAADaFbl1AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAABvUlEQVR4nO3a0WqDQBAF0FmT2v//3ELq9KEuiDWNIVpZew4EM9GHhXCzM0siAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeyMxy9BoAAAAAAAAAAABgL5nZZWbv/3Lb6Y5eALspEfEmLNsQlHMTlo0IyvnVsPiuX3A9egHsJmf1NTPzzv3PUsr8eSYE5X+Yh2BaD0LymKCcU4nfw1HrLKUMf7OktgnKyYyzSBcrgiIk6zkNOZHxdOtSy6VH6lW79RxBaVBmXiKij4iPuiuMIZmfbC2GRUiep/Vq0xDfP3LvmXmLiFsszyUxfnbvHivZURqVmf20HF915iiza4bTrZcISqPG9msahFh4H6HV2oTWq121/Zr6EQgh2YYdpWGTAb62XoKxEztK+8weAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACw0hcO3WMluFqQfAAAAABJRU5ErkJggg==", - "e": 1 - }, - { - "id": "sequence_0", - "layers": [ - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_0", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 0, - "st": 0, - "op": 1, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_1", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 1, - "st": 1, - "op": 2, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_2", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 2, - "st": 2, - "op": 3, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_3", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 3, - "st": 3, - "op": 4, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_4", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 4, - "st": 4, - "op": 5, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_5", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 5, - "st": 5, - "op": 6, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_6", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 6, - "st": 6, - "op": 7, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_7", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 7, - "st": 7, - "op": 8, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_8", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 8, - "st": 8, - "op": 9, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_9", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 9, - "st": 9, - "op": 10, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_10", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 10, - "st": 10, - "op": 11, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_11", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 11, - "st": 11, - "op": 12, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_12", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 12, - "st": 12, - "op": 13, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_13", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 13, - "st": 13, - "op": 14, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_14", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 14, - "st": 14, - "op": 15, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_15", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 15, - "st": 15, - "op": 16, - "sr": 1, - "bm": 0 - }, - { - "ty": 2, - "sc": "#00ffff", - "refId": "imgSeq_16", - "ks": { - "p": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ] - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ] - }, - "r": { - "a": 0, - "k": [ - 0 - ] - }, - "o": { - "a": 0, - "k": [ - 100 - ] - } - }, - "ip": 16, - "st": 16, - "op": 18, - "sr": 1, - "bm": 0 - } - ] - }, - { - "id": "comp_0", - "layers": [ - { - "ddd": 0, - "ind": 1, - "ty": 4, - "nm": "✨流星", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 47.228, - 61.728, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "hasMask": true, - "masksProperties": [ - { - "inv": false, - "mode": "a", - "pt": { - "a": 0, - "k": { - "i": [ - [ - 42.388, - 0 - ], - [ - 0, - -42.388 - ], - [ - -42.388, - 0 - ], - [ - 0, - 42.388 - ] - ], - "o": [ - [ - -42.388, - 0 - ], - [ - 0, - 42.388 - ], - [ - 42.388, - 0 - ], - [ - 0, - -42.388 - ] - ], - "v": [ - [ - 54.022, - -48.728 - ], - [ - -22.728, - 28.022 - ], - [ - 54.022, - 104.772 - ], - [ - 130.772, - 28.022 - ] - ], - "c": true - }, - "ix": 1 - }, - "o": { - "a": 0, - "k": 100, - "ix": 3 - }, - "x": { - "a": 0, - "k": 0, - "ix": 4 - }, - "nm": "蒙版 1" - } - ], - "ef": [ - { - "ty": 5, - "nm": "残影", - "np": 7, - "mn": "ADBE Echo", - "ix": 1, - "en": 1, - "ef": [ - { - "ty": 0, - "nm": "残影时间（秒）", - "mn": "ADBE Echo-0001", - "ix": 1, - "v": { - "a": 0, - "k": -0.028, - "ix": 1 - } - }, - { - "ty": 0, - "nm": "残影数量", - "mn": "ADBE Echo-0002", - "ix": 2, - "v": { - "a": 0, - "k": 3, - "ix": 2 - } - }, - { - "ty": 0, - "nm": "起始强度", - "mn": "ADBE Echo-0003", - "ix": 3, - "v": { - "a": 0, - "k": 1, - "ix": 3 - } - }, - { - "ty": 0, - "nm": "衰减", - "mn": "ADBE Echo-0004", - "ix": 4, - "v": { - "a": 0, - "k": 0.3, - "ix": 4 - } - }, - { - "ty": 7, - "nm": "残影运算符", - "mn": "ADBE Echo-0005", - "ix": 5, - "v": { - "a": 0, - "k": 1, - "ix": 5 - } - } - ] - } - ], - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 0, - 3.51 - ], - [ - -5.66, - 5.66 - ], - [ - -3.51, - 0 - ], - [ - -5.66, - -5.66 - ], - [ - 0, - -3.51 - ], - [ - 5.66, - -5.66 - ], - [ - 3.51, - 0 - ], - [ - 5.66, - 5.66 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "rd", - "nm": "圆角 1", - "r": { - "a": 0, - "k": 0.6, - "ix": 1 - }, - "ix": 2, - "mn": "ADBE Vector Filter - RC", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.74, - "y": 1 - }, - "o": { - "x": 0.167, - "y": 0.159 - }, - "t": 36, - "s": [ - 38.732, - -68.361 - ], - "to": [ - -12.362, - 18.721 - ], - "ti": [ - 12.362, - -18.721 - ] - }, - { - "t": 46, - "s": [ - -35.439, - 43.968 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.74 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0.167 - ] - }, - "t": 36, - "s": [ - -45 - ] - }, - { - "t": 46, - "s": [ - 720 - ] - } - ], - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "星形", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 0, - 3.07 - ], - [ - -4.95, - 4.95 - ], - [ - -3.07, - 0 - ], - [ - -4.95, - -4.95 - ], - [ - 0, - -3.07 - ], - [ - 4.95, - -4.95 - ], - [ - 3.07, - 0 - ], - [ - 4.95, - 4.95 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "rd", - "nm": "圆角 1", - "r": { - "a": 0, - "k": 0.6, - "ix": 1 - }, - "ix": 2, - "mn": "ADBE Vector Filter - RC", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.74, - "y": 1 - }, - "o": { - "x": 0.167, - "y": 0.157 - }, - "t": 39, - "s": [ - 94.317, - -52.128 - ], - "to": [ - -17.959, - 23.196 - ], - "ti": [ - 17.959, - -23.196 - ] - }, - { - "t": 49, - "s": [ - -13.44, - 87.049 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.74 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0.167 - ] - }, - "t": 39, - "s": [ - -45 - ] - }, - { - "t": 49, - "s": [ - 720 - ] - } - ], - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "星形 2", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 2, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 0, - 3.95 - ], - [ - -6.36, - 6.36 - ], - [ - -3.95, - 0 - ], - [ - -6.36, - -6.36 - ], - [ - 0, - -3.95 - ], - [ - 6.36, - -6.36 - ], - [ - 3.95, - 0 - ], - [ - 6.36, - 6.36 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "rd", - "nm": "圆角 1", - "r": { - "a": 0, - "k": 0.6, - "ix": 1 - }, - "ix": 2, - "mn": "ADBE Vector Filter - RC", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.74, - "y": 1 - }, - "o": { - "x": 0.167, - "y": 0.156 - }, - "t": 42, - "s": [ - 154.797, - -1.631 - ], - "to": [ - -15.644, - 20.128 - ], - "ti": [ - 15.644, - -20.128 - ] - }, - { - "t": 52, - "s": [ - 60.936, - 119.135 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.74 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0.167 - ] - }, - "t": 42, - "s": [ - -45 - ] - }, - { - "t": 52, - "s": [ - 1080 - ] - } - ], - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "星形 3", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 3, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 300, - "st": 0, - "bm": 0 - } - ] - } - ], - "layers": [ - { - "ddd": 0, - "ind": 1, - "ty": 4, - "nm": "▨ 墨镜 右 2", - "td": 1, - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.833, - "y": 0.833 - }, - "o": { - "x": 0.52, - "y": 0 - }, - "t": 56, - "s": [ - 106.898, - 80.715, - 0 - ], - "to": [ - 0, - 0.958, - 0 - ], - "ti": [ - 0, - -0.958, - 0 - ] - }, - { - "t": 62, - "s": [ - 106.898, - 86.465, - 0 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 12.899, - -0.035, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - -7.57, - 0 - ], - [ - 0, - -0.82 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 6.57, - 0 - ], - [ - 0.87, - 7.18 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0.74, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -0.12, - 8.14 - ], - [ - -6.04, - 0 - ], - [ - -0.34, - -2.81 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 23.66, - -9 - ], - [ - 25, - -7.51 - ], - [ - 25, - -6.01 - ], - [ - 25, - -5.75 - ], - [ - 12.97, - 8.93 - ], - [ - 1.42, - -2.962 - ], - [ - 1.42, - -9.012 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "墨镜", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 0, - 0, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - } - ], - "ip": 0, - "op": 300, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 2, - "ty": 4, - "nm": "高光4", - "parent": 1, - "tt": 1, - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.48, - "y": 1 - }, - "o": { - "x": 0.167, - "y": 0.167 - }, - "t": 31, - "s": [ - -3.75, - -3.25, - 0 - ], - "to": [ - 2.292, - 0, - 0 - ], - "ti": [ - -2.292, - 0, - 0 - ] - }, - { - "i": { - "x": 0.48, - "y": 0.48 - }, - "o": { - "x": 0.26, - "y": 0.26 - }, - "t": 41, - "s": [ - 10, - -3.25, - 0 - ], - "to": [ - 0, - 0, - 0 - ], - "ti": [ - 0, - 0, - 0 - ] - }, - { - "i": { - "x": 0.833, - "y": 0.833 - }, - "o": { - "x": 0.26, - "y": 0 - }, - "t": 56, - "s": [ - 10, - -3.25, - 0 - ], - "to": [ - 3.375, - 0, - 0 - ], - "ti": [ - -3.375, - 0, - 0 - ] - }, - { - "t": 62, - "s": [ - 30.25, - -3.25, - 0 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "rc", - "d": 1, - "s": { - "a": 0, - "k": [ - 6, - 36 - ], - "ix": 2 - }, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 4 - }, - "nm": "矩形路径 1", - "mn": "ADBE Vector Shape - Rect", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 0.105882354081, - 0.098039217293, - 0.211764708161, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": -330, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "高光1", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 31, - "op": 331, - "st": 31, - "bm": 0 - }, - { - "ddd": 0, - "ind": 3, - "ty": 4, - "nm": "▨ 墨镜 左 2", - "td": 1, - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.833, - "y": 0.833 - }, - "o": { - "x": 0.52, - "y": 0 - }, - "t": 56, - "s": [ - 94.123, - 80.75, - 0 - ], - "to": [ - 0, - 0.958, - 0 - ], - "ti": [ - 0, - -0.958, - 0 - ] - }, - { - "t": 62, - "s": [ - 94.123, - 86.5, - 0 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0.157, - -1.294 - ], - [ - 6.04, - 0 - ], - [ - 0.12, - 8.14 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -0.74, - 0 - ], - [ - 0, - 0 - ], - [ - 0.054, - -1.31 - ] - ], - "o": [ - [ - -0.87, - 7.18 - ], - [ - -6.57, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - -0.82 - ], - [ - 3.877, - 0 - ], - [ - 0, - 0 - ], - [ - -0.046, - 1.118 - ] - ], - "v": [ - [ - -3.34, - -2.95 - ], - [ - -14.24, - 9 - ], - [ - -25, - -5.75 - ], - [ - -25, - -6.01 - ], - [ - -25, - -7.51 - ], - [ - -23.66, - -9 - ], - [ - -2.998, - -9 - ], - [ - -3.053, - -6.747 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "墨镜", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 0, - 0, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - } - ], - "ip": -58, - "op": 242, - "st": -58, - "bm": 0 - }, - { - "ddd": 0, - "ind": 4, - "ty": 4, - "nm": "高光3", - "parent": 3, - "tt": 1, - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.48, - "y": 1 - }, - "o": { - "x": 0.167, - "y": 0.167 - }, - "t": 31, - "s": [ - -33.125, - -2.25, - 0 - ], - "to": [ - 2.625, - 0, - 0 - ], - "ti": [ - -2.625, - 0, - 0 - ] - }, - { - "i": { - "x": 0.48, - "y": 0.48 - }, - "o": { - "x": 0.26, - "y": 0.26 - }, - "t": 41, - "s": [ - -17.375, - -2.25, - 0 - ], - "to": [ - 0, - 0, - 0 - ], - "ti": [ - 0, - 0, - 0 - ] - }, - { - "i": { - "x": 0.833, - "y": 0.833 - }, - "o": { - "x": 0.26, - "y": 0 - }, - "t": 56, - "s": [ - -17.375, - -2.25, - 0 - ], - "to": [ - 3.375, - 0, - 0 - ], - "ti": [ - -3.375, - 0, - 0 - ] - }, - { - "t": 62, - "s": [ - 2.875, - -2.25, - 0 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "rc", - "d": 1, - "s": { - "a": 0, - "k": [ - 6, - 36 - ], - "ix": 2 - }, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 4 - }, - "nm": "矩形路径 1", - "mn": "ADBE Vector Shape - Rect", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 0.105882354081, - 0.098039217293, - 0.211764708161, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": -330, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "高光1", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 31, - "op": 331, - "st": 31, - "bm": 0 - }, - { - "ddd": 0, - "ind": 5, - "ty": 4, - "nm": "▨ 墨镜 右", - "td": 1, - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 106.898, - 80.715, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 12.899, - -0.035, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - -7.57, - 0 - ], - [ - 0, - -0.82 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 6.57, - 0 - ], - [ - 0.87, - 7.18 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0.74, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -0.12, - 8.14 - ], - [ - -6.04, - 0 - ], - [ - -0.34, - -2.81 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 23.66, - -9 - ], - [ - 25, - -7.51 - ], - [ - 25, - -6.01 - ], - [ - 25, - -5.75 - ], - [ - 12.97, - 8.93 - ], - [ - 1.42, - -2.962 - ], - [ - 1.42, - -9.012 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "墨镜", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 0, - 0, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - } - ], - "ip": 0, - "op": 300, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 6, - "ty": 4, - "nm": "高光2", - "parent": 5, - "tt": 1, - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.48, - "y": 1 - }, - "o": { - "x": 0.167, - "y": 0.167 - }, - "t": 16, - "s": [ - -3.75, - -3.25, - 0 - ], - "to": [ - 5.917, - 0, - 0 - ], - "ti": [ - -5.917, - 0, - 0 - ] - }, - { - "t": 26, - "s": [ - 31.75, - -3.25, - 0 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "rc", - "d": 1, - "s": { - "a": 0, - "k": [ - 6, - 36 - ], - "ix": 2 - }, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 4 - }, - "nm": "矩形路径 1", - "mn": "ADBE Vector Shape - Rect", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 0.105882354081, - 0.098039217293, - 0.211764708161, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": -330, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "高光1", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 16, - "op": 316, - "st": 16, - "bm": 0 - }, - { - "ddd": 0, - "ind": 7, - "ty": 4, - "nm": "▨ 墨镜 左", - "td": 1, - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 80.124, - 80.75, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - -13.999, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0.157, - -1.294 - ], - [ - 6.04, - 0 - ], - [ - 0.12, - 8.14 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -0.74, - 0 - ], - [ - 0, - 0 - ], - [ - 0.054, - -1.31 - ] - ], - "o": [ - [ - -0.87, - 7.18 - ], - [ - -6.57, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - -0.82 - ], - [ - 3.877, - 0 - ], - [ - 0, - 0 - ], - [ - -0.046, - 1.118 - ] - ], - "v": [ - [ - -3.34, - -2.95 - ], - [ - -14.24, - 9 - ], - [ - -25, - -5.75 - ], - [ - -25, - -6.01 - ], - [ - -25, - -7.51 - ], - [ - -23.66, - -9 - ], - [ - -2.998, - -9 - ], - [ - -3.053, - -6.747 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "墨镜", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 0, - 0, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - } - ], - "ip": -58, - "op": 242, - "st": -58, - "bm": 0 - }, - { - "ddd": 0, - "ind": 8, - "ty": 4, - "nm": "高光1", - "parent": 7, - "tt": 1, - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.48, - "y": 1 - }, - "o": { - "x": 0.167, - "y": 0.167 - }, - "t": 16, - "s": [ - -33.125, - -2.25, - 0 - ], - "to": [ - 6.042, - 0, - 0 - ], - "ti": [ - -6.042, - 0, - 0 - ] - }, - { - "t": 26, - "s": [ - 3.125, - -2.25, - 0 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "rc", - "d": 1, - "s": { - "a": 0, - "k": [ - 6, - 36 - ], - "ix": 2 - }, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 4 - }, - "nm": "矩形路径 1", - "mn": "ADBE Vector Shape - Rect", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 0.105882354081, - 0.098039217293, - 0.211764708161, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": -330, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "高光1", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 16, - "op": 316, - "st": 16, - "bm": 0 - }, - { - "ddd": 0, - "ind": 9, - "ty": 4, - "nm": "墨镜", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.48, - "y": 1 - }, - "o": { - "x": 0.167, - "y": 0.167 - }, - "t": 5, - "s": [ - 93.748, - 86, - 0 - ], - "to": [ - 0.042, - -0.875, - 0 - ], - "ti": [ - -0.042, - 0.875, - 0 - ] - }, - { - "i": { - "x": 0.833, - "y": 0.833 - }, - "o": { - "x": 0.167, - "y": 0.167 - }, - "t": 11, - "s": [ - 93.998, - 80.75, - 0 - ], - "to": [ - 0, - 0, - 0 - ], - "ti": [ - 0, - 0, - 0 - ] - }, - { - "i": { - "x": 0.833, - "y": 0.833 - }, - "o": { - "x": 0.52, - "y": 0 - }, - "t": 56, - "s": [ - 93.998, - 80.75, - 0 - ], - "to": [ - -0.042, - 0.875, - 0 - ], - "ti": [ - 0.042, - -0.875, - 0 - ] - }, - { - "t": 62, - "s": [ - 93.748, - 86, - 0 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - -7.57, - 0 - ], - [ - 0, - -0.82 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 6.57, - 0 - ], - [ - 0.87, - 7.18 - ], - [ - 0.34, - -2.81 - ], - [ - 6.04, - 0 - ], - [ - 0.12, - 8.14 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -0.74, - 0 - ], - [ - -8.2, - 0 - ] - ], - "o": [ - [ - 0.74, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -0.12, - 8.14 - ], - [ - -6.04, - 0 - ], - [ - -0.34, - -2.81 - ], - [ - -0.87, - 7.18 - ], - [ - -6.57, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - -0.82 - ], - [ - 8.2, - 0 - ], - [ - 7.57, - 0 - ] - ], - "v": [ - [ - 23.66, - -9 - ], - [ - 25, - -7.51 - ], - [ - 25, - -6.01 - ], - [ - 25, - -5.75 - ], - [ - 12.97, - 8.93 - ], - [ - 0.95, - -2.95 - ], - [ - -3.34, - -2.95 - ], - [ - -14.24, - 9 - ], - [ - -25, - -5.75 - ], - [ - -25, - -6.01 - ], - [ - -25, - -7.51 - ], - [ - -23.66, - -9 - ], - [ - 0.95, - -9 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "墨镜", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 300, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 10, - "ty": 4, - "nm": "左腮红", - "sr": 1, - "ks": { - "o": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.48 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0.167 - ] - }, - "t": 5, - "s": [ - 0 - ] - }, - { - "i": { - "x": [ - 0.48 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0 - ] - }, - "t": 10, - "s": [ - 100 - ] - }, - { - "i": { - "x": [ - 0.833 - ], - "y": [ - 0.833 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0 - ] - }, - "t": 57, - "s": [ - 100 - ] - }, - { - "t": 62, - "s": [ - 0 - ] - } - ], - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 115.824, - 94.051, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "d": 1, - "ty": "el", - "s": { - "a": 0, - "k": [ - 13, - 8 - ], - "ix": 2 - }, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "nm": "椭圆路径 1", - "mn": "ADBE Vector Shape - Ellipse", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 0.250980407 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 25, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": -5, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "左腮红", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 289, - "st": -11, - "bm": 0 - }, - { - "ddd": 0, - "ind": 11, - "ty": 4, - "nm": "左腮红", - "sr": 1, - "ks": { - "o": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.48 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0.167 - ] - }, - "t": 5, - "s": [ - 0 - ] - }, - { - "i": { - "x": [ - 0.48 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0 - ] - }, - "t": 10, - "s": [ - 100 - ] - }, - { - "i": { - "x": [ - 0.833 - ], - "y": [ - 0.833 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0 - ] - }, - "t": 57, - "s": [ - 100 - ] - }, - { - "t": 62, - "s": [ - 0 - ] - } - ], - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 70.824, - 94.051, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "d": 1, - "ty": "el", - "s": { - "a": 0, - "k": [ - 13, - 8 - ], - "ix": 2 - }, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "nm": "椭圆路径 1", - "mn": "ADBE Vector Shape - Ellipse", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 0.250980407 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 25, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 5, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "左腮红", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 289, - "st": -11, - "bm": 0 - }, - { - "ddd": 0, - "ind": 12, - "ty": 4, - "nm": "嘴巴 2", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.833, - "y": 1 - }, - "o": { - "x": 0.167, - "y": 0.167 - }, - "t": 57, - "s": [ - 94.195, - 99.5, - 0 - ], - "to": [ - 0, - 0.169, - 0 - ], - "ti": [ - 0, - -0.169, - 0 - ] - }, - { - "t": 62, - "s": [ - 94.195, - 100.513, - 0 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - -3.65, - 8.13 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0.02, - -0.2 - ] - ], - "v": [ - [ - -6, - 1.4 - ], - [ - 6, - -2.5 - ] - ], - "c": false - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "tm", - "s": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.833 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0.167 - ] - }, - "t": 57, - "s": [ - 15 - ] - }, - { - "t": 62, - "s": [ - 0 - ] - } - ], - "ix": 1 - }, - "e": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.833 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.167 - ], - "y": [ - 0.167 - ] - }, - "t": 57, - "s": [ - 100 - ] - }, - { - "t": 62, - "s": [ - 65 - ] - } - ], - "ix": 2 - }, - "o": { - "a": 0, - "k": 0, - "ix": 3 - }, - "m": 1, - "ix": 2, - "nm": "修剪路径 1", - "mn": "ADBE Vector Filter - Trim", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 3, - "ix": 5 - }, - "lc": 2, - "lj": 2, - "bm": 0, - "nm": "描边 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - -0.25, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": -5, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "嘴巴", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 56, - "op": 306, - "st": 6, - "bm": 0 - }, - { - "ddd": 0, - "ind": 13, - "ty": 4, - "nm": "嘴巴", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.833, - "y": 0.833 - }, - "o": { - "x": 0.26, - "y": 0.74 - }, - "t": 5, - "s": [ - 94.195, - 100.513, - 0 - ], - "to": [ - 0, - -0.169, - 0 - ], - "ti": [ - 0, - 0.169, - 0 - ] - }, - { - "t": 10, - "s": [ - 94.195, - 99.5, - 0 - ] - } - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - -3.65, - 8.13 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0.02, - -0.2 - ] - ], - "v": [ - [ - -6, - 1.4 - ], - [ - 6, - -2.5 - ] - ], - "c": false - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "tm", - "s": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.833 - ], - "y": [ - 0.833 - ] - }, - "o": { - "x": [ - 0.26 - ], - "y": [ - 0.5 - ] - }, - "t": 5, - "s": [ - 0 - ] - }, - { - "t": 10, - "s": [ - 15 - ] - } - ], - "ix": 1, - "x": "var $bm_rt;\nvar nearestKeyIndex, nearestKeyIndex, currentTime, currentTime, calculatedVelocity, amplitude, frequency, decay;\n$bm_rt = nearestKeyIndex = 0;\nif (numKeys > 0) {\n $bm_rt = nearestKeyIndex = nearestKey(time).index;\n if (key(nearestKeyIndex).time > time) {\n nearestKeyIndex--;\n }\n}\nif (nearestKeyIndex == 0) {\n $bm_rt = currentTime = 0;\n} else {\n $bm_rt = currentTime = $bm_sub(time, key(nearestKeyIndex).time);\n}\nif (nearestKeyIndex > 0 && currentTime < 1) {\n calculatedVelocity = velocityAtTime($bm_sub(key(nearestKeyIndex).time, $bm_div(thisComp.frameDuration, 10)));\n amplitude = 0.2;\n frequency = 2;\n decay = 6;\n $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(calculatedVelocity, amplitude), Math.sin($bm_mul($bm_mul($bm_mul(frequency, currentTime), 2), Math.PI))), Math.exp($bm_mul(decay, currentTime))));\n} else {\n $bm_rt = value;\n}" - }, - "e": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.833 - ], - "y": [ - 0.833 - ] - }, - "o": { - "x": [ - 0.26 - ], - "y": [ - 0.5 - ] - }, - "t": 5, - "s": [ - 65 - ] - }, - { - "t": 10, - "s": [ - 100 - ] - } - ], - "ix": 2, - "x": "var $bm_rt;\nvar nearestKeyIndex, nearestKeyIndex, currentTime, currentTime, calculatedVelocity, amplitude, frequency, decay;\n$bm_rt = nearestKeyIndex = 0;\nif (numKeys > 0) {\n $bm_rt = nearestKeyIndex = nearestKey(time).index;\n if (key(nearestKeyIndex).time > time) {\n nearestKeyIndex--;\n }\n}\nif (nearestKeyIndex == 0) {\n $bm_rt = currentTime = 0;\n} else {\n $bm_rt = currentTime = $bm_sub(time, key(nearestKeyIndex).time);\n}\nif (nearestKeyIndex > 0 && currentTime < 1) {\n calculatedVelocity = velocityAtTime($bm_sub(key(nearestKeyIndex).time, $bm_div(thisComp.frameDuration, 10)));\n amplitude = 0.2;\n frequency = 2;\n decay = 6;\n $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(calculatedVelocity, amplitude), Math.sin($bm_mul($bm_mul($bm_mul(frequency, currentTime), 2), Math.PI))), Math.exp($bm_mul(decay, currentTime))));\n} else {\n $bm_rt = value;\n}" - }, - "o": { - "a": 0, - "k": 0, - "ix": 3 - }, - "m": 1, - "ix": 2, - "nm": "修剪路径 1", - "mn": "ADBE Vector Filter - Trim", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 3, - "ix": 5 - }, - "lc": 2, - "lj": 2, - "bm": 0, - "nm": "描边 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - -0.25, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": -5, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "嘴巴", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 56, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 14, - "ty": 4, - "nm": "右眼", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 108, - 77, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "d": 1, - "ty": "el", - "s": { - "a": 0, - "k": [ - 10, - 10 - ], - "ix": 2 - }, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "nm": "椭圆路径 1", - "mn": "ADBE Vector Shape - Ellipse", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "右眼", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 300, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 15, - "ty": 4, - "nm": "左眼", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 80, - 77, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - -0.028, - -0.775 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "椭圆 1", - "np": 1, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "gr", - "it": [ - { - "d": 1, - "ty": "el", - "s": { - "a": 0, - "k": [ - 10, - 10 - ], - "ix": 2 - }, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "nm": "椭圆路径 1", - "mn": "ADBE Vector Shape - Ellipse", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "左眼", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 2, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 300, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 16, - "ty": 4, - "nm": "折角", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 124.125, - 116.629, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 4.15, - 0 - ], - [ - 0, - -10.44 - ], - [ - -0.76, - -2.02 - ], - [ - -0.47, - -0.83 - ] - ], - "o": [ - [ - -3.16, - -2.16 - ], - [ - -10.73, - 0 - ], - [ - 0, - 2.29 - ], - [ - 0.34, - 0.9 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 15.125, - -11.559 - ], - [ - 4.315, - -14.129 - ], - [ - -15.125, - 4.771 - ], - [ - -13.945, - 11.271 - ], - [ - -12.535, - 14.131 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 3.165, - "ix": 5 - }, - "lc": 2, - "lj": 2, - "bm": 0, - "nm": "描边 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 0.20000000298 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 20, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "折角", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 300, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 17, - "ty": 4, - "nm": "圆圈", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 101, - 91.5, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 4.61 - ], - [ - 22.64, - 0 - ], - [ - 0, - -22.64 - ], - [ - -22.64, - 0 - ], - [ - -3.19, - 0.79 - ] - ], - "o": [ - [ - 1.4, - -4.14 - ], - [ - 0, - -22.64 - ], - [ - -22.64, - 0 - ], - [ - 0, - 22.64 - ], - [ - 3.44, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 38.25, - 13.57 - ], - [ - 41, - 0 - ], - [ - 0, - -41 - ], - [ - -41, - 0 - ], - [ - 0, - 41 - ], - [ - 10.59, - 39.26 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "路径 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 3, - "ix": 5 - }, - "lc": 2, - "lj": 2, - "bm": 0, - "nm": "描边 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 0.105882354081, - 0.098039217293, - 0.211764708161, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "填充 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "变换" - } - ], - "nm": "圆圈", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 300, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 18, - "ty": 0, - "nm": "流星_[00036-00052].png", - "cl": "png", - "refId": "sequence_0", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 101, - 122, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 101, - 122, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "w": 202, - "h": 244, - "ip": 36, - "op": 53, - "st": 36, - "bm": 0 - }, - { - "ddd": 0, - "ind": 19, - "ty": 0, - "nm": "流星", - "refId": "comp_0", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 101, - 122, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 101, - 122, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100, - 100 - ], - "ix": 6 - } - }, - "ao": 0, - "w": 202, - "h": 244, - "ip": 0, - "op": 300, - "st": 0, - "bm": 0 - } - ], - "markers": [ - { - "tm": 0, - "cm": "0", - "dr": 0 - }, - { - "tm": 5, - "cm": "1", - "dr": 0 - }, - { - "tm": 16, - "cm": "2", - "dr": 0 - }, - { - "tm": 41, - "cm": "3", - "dr": 0 - }, - { - "tm": 56, - "cm": "4", - "dr": 0 - }, - { - "tm": 62, - "cm": "5", - "dr": 0 - } - ] -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/animoji/baihu_Animoji.bundle b/FaceUnity/src/main/assets/animoji/baihu_Animoji.bundle deleted file mode 100644 index a78c51d65..000000000 Binary files a/FaceUnity/src/main/assets/animoji/baihu_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/baimao_Animoji.bundle b/FaceUnity/src/main/assets/animoji/baimao_Animoji.bundle deleted file mode 100644 index 708a73cae..000000000 Binary files a/FaceUnity/src/main/assets/animoji/baimao_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/cartoon_princess_Animoji.bundle b/FaceUnity/src/main/assets/animoji/cartoon_princess_Animoji.bundle deleted file mode 100644 index cab34c84d..000000000 Binary files a/FaceUnity/src/main/assets/animoji/cartoon_princess_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/douniuquan_Animoji.bundle b/FaceUnity/src/main/assets/animoji/douniuquan_Animoji.bundle deleted file mode 100644 index 74ae417ed..000000000 Binary files a/FaceUnity/src/main/assets/animoji/douniuquan_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/frog_Animoji.bundle b/FaceUnity/src/main/assets/animoji/frog_Animoji.bundle deleted file mode 100644 index 84ac64458..000000000 Binary files a/FaceUnity/src/main/assets/animoji/frog_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/hashiqi_Animoji.bundle b/FaceUnity/src/main/assets/animoji/hashiqi_Animoji.bundle deleted file mode 100644 index 52843b920..000000000 Binary files a/FaceUnity/src/main/assets/animoji/hashiqi_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/hetun_Animoji.bundle b/FaceUnity/src/main/assets/animoji/hetun_Animoji.bundle deleted file mode 100644 index 2a8ddfbd4..000000000 Binary files a/FaceUnity/src/main/assets/animoji/hetun_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/huangya_Animoji.bundle b/FaceUnity/src/main/assets/animoji/huangya_Animoji.bundle deleted file mode 100644 index 50f51182c..000000000 Binary files a/FaceUnity/src/main/assets/animoji/huangya_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/kaola_Animoji.bundle b/FaceUnity/src/main/assets/animoji/kaola_Animoji.bundle deleted file mode 100644 index bbbad5d30..000000000 Binary files a/FaceUnity/src/main/assets/animoji/kaola_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/kuloutou_Animoji.bundle b/FaceUnity/src/main/assets/animoji/kuloutou_Animoji.bundle deleted file mode 100644 index b69842c62..000000000 Binary files a/FaceUnity/src/main/assets/animoji/kuloutou_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/qgirl_Animoji.bundle b/FaceUnity/src/main/assets/animoji/qgirl_Animoji.bundle deleted file mode 100644 index 9b93c855c..000000000 Binary files a/FaceUnity/src/main/assets/animoji/qgirl_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/animoji/wuxia_Animoji.bundle b/FaceUnity/src/main/assets/animoji/wuxia_Animoji.bundle deleted file mode 100644 index 8dc259842..000000000 Binary files a/FaceUnity/src/main/assets/animoji/wuxia_Animoji.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/action/actiongame_android.bundle b/FaceUnity/src/main/assets/effect/action/actiongame_android.bundle deleted file mode 100644 index 4eaf23ef2..000000000 Binary files a/FaceUnity/src/main/assets/effect/action/actiongame_android.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/ar/baozi.bundle b/FaceUnity/src/main/assets/effect/ar/baozi.bundle deleted file mode 100644 index 234c5c70b..000000000 Binary files a/FaceUnity/src/main/assets/effect/ar/baozi.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/ar/bluebird.bundle b/FaceUnity/src/main/assets/effect/ar/bluebird.bundle deleted file mode 100644 index 9a26e4229..000000000 Binary files a/FaceUnity/src/main/assets/effect/ar/bluebird.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/ar/fenhudie.bundle b/FaceUnity/src/main/assets/effect/ar/fenhudie.bundle deleted file mode 100644 index affbcb7a3..000000000 Binary files a/FaceUnity/src/main/assets/effect/ar/fenhudie.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/ar/lanhudie.bundle b/FaceUnity/src/main/assets/effect/ar/lanhudie.bundle deleted file mode 100644 index b7476fef8..000000000 Binary files a/FaceUnity/src/main/assets/effect/ar/lanhudie.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/ar/tiger.bundle b/FaceUnity/src/main/assets/effect/ar/tiger.bundle deleted file mode 100644 index 0997d0f6a..000000000 Binary files a/FaceUnity/src/main/assets/effect/ar/tiger.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/ar/tiger_bai.bundle b/FaceUnity/src/main/assets/effect/ar/tiger_bai.bundle deleted file mode 100644 index d4a68138d..000000000 Binary files a/FaceUnity/src/main/assets/effect/ar/tiger_bai.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/ar/tiger_huang.bundle b/FaceUnity/src/main/assets/effect/ar/tiger_huang.bundle deleted file mode 100644 index d94500201..000000000 Binary files a/FaceUnity/src/main/assets/effect/ar/tiger_huang.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/ar/xiongmao.bundle b/FaceUnity/src/main/assets/effect/ar/xiongmao.bundle deleted file mode 100644 index 57c1f94a9..000000000 Binary files a/FaceUnity/src/main/assets/effect/ar/xiongmao.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/big_head/big_head.bundle b/FaceUnity/src/main/assets/effect/big_head/big_head.bundle deleted file mode 100644 index 3c7890ab7..000000000 Binary files a/FaceUnity/src/main/assets/effect/big_head/big_head.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp2.bundle b/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp2.bundle deleted file mode 100644 index 9e23331fe..000000000 Binary files a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp2.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp4.bundle b/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp4.bundle deleted file mode 100644 index 778646332..000000000 Binary files a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp4.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp5.bundle b/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp5.bundle deleted file mode 100644 index ccef9c7f5..000000000 Binary files a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp5.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp6.bundle b/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp6.bundle deleted file mode 100644 index 96ee4f503..000000000 Binary files a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp6.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/big_head/big_head_smile.bundle b/FaceUnity/src/main/assets/effect/big_head/big_head_smile.bundle deleted file mode 100644 index a90c68982..000000000 Binary files a/FaceUnity/src/main/assets/effect/big_head/big_head_smile.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/expression/future_warrior.bundle b/FaceUnity/src/main/assets/effect/expression/future_warrior.bundle deleted file mode 100644 index 16db3286c..000000000 Binary files a/FaceUnity/src/main/assets/effect/expression/future_warrior.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/expression/jet_mask.bundle b/FaceUnity/src/main/assets/effect/expression/jet_mask.bundle deleted file mode 100644 index baf7eb1e8..000000000 Binary files a/FaceUnity/src/main/assets/effect/expression/jet_mask.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/expression/luhantongkuan_ztt_fu.bundle b/FaceUnity/src/main/assets/effect/expression/luhantongkuan_ztt_fu.bundle deleted file mode 100644 index 3e467c1d6..000000000 Binary files a/FaceUnity/src/main/assets/effect/expression/luhantongkuan_ztt_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/expression/qingqing_ztt_fu.bundle b/FaceUnity/src/main/assets/effect/expression/qingqing_ztt_fu.bundle deleted file mode 100644 index 8cdeaf20b..000000000 Binary files a/FaceUnity/src/main/assets/effect/expression/qingqing_ztt_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/expression/sdx2.bundle b/FaceUnity/src/main/assets/effect/expression/sdx2.bundle deleted file mode 100644 index fb8fb3fa7..000000000 Binary files a/FaceUnity/src/main/assets/effect/expression/sdx2.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/expression/xiaobianzi_zh_fu.bundle b/FaceUnity/src/main/assets/effect/expression/xiaobianzi_zh_fu.bundle deleted file mode 100644 index fdfa9a2b2..000000000 Binary files a/FaceUnity/src/main/assets/effect/expression/xiaobianzi_zh_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/expression/xiaoxueshen_ztt_fu.bundle b/FaceUnity/src/main/assets/effect/expression/xiaoxueshen_ztt_fu.bundle deleted file mode 100644 index 61e282fb2..000000000 Binary files a/FaceUnity/src/main/assets/effect/expression/xiaoxueshen_ztt_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/facewarp/facewarp2.bundle b/FaceUnity/src/main/assets/effect/facewarp/facewarp2.bundle deleted file mode 100644 index 8868e88bd..000000000 Binary files a/FaceUnity/src/main/assets/effect/facewarp/facewarp2.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/facewarp/facewarp3.bundle b/FaceUnity/src/main/assets/effect/facewarp/facewarp3.bundle deleted file mode 100644 index 71a32bf1d..000000000 Binary files a/FaceUnity/src/main/assets/effect/facewarp/facewarp3.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/facewarp/facewarp4.bundle b/FaceUnity/src/main/assets/effect/facewarp/facewarp4.bundle deleted file mode 100644 index a35cb6b95..000000000 Binary files a/FaceUnity/src/main/assets/effect/facewarp/facewarp4.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/facewarp/facewarp5.bundle b/FaceUnity/src/main/assets/effect/facewarp/facewarp5.bundle deleted file mode 100644 index a0fabc925..000000000 Binary files a/FaceUnity/src/main/assets/effect/facewarp/facewarp5.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/facewarp/facewarp6.bundle b/FaceUnity/src/main/assets/effect/facewarp/facewarp6.bundle deleted file mode 100644 index ffbd3b821..000000000 Binary files a/FaceUnity/src/main/assets/effect/facewarp/facewarp6.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/gesture/ctrl_flower.bundle b/FaceUnity/src/main/assets/effect/gesture/ctrl_flower.bundle deleted file mode 100644 index fad2583fb..000000000 Binary files a/FaceUnity/src/main/assets/effect/gesture/ctrl_flower.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/gesture/ctrl_rain.bundle b/FaceUnity/src/main/assets/effect/gesture/ctrl_rain.bundle deleted file mode 100644 index c34a4b09b..000000000 Binary files a/FaceUnity/src/main/assets/effect/gesture/ctrl_rain.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/gesture/ctrl_snow.bundle b/FaceUnity/src/main/assets/effect/gesture/ctrl_snow.bundle deleted file mode 100644 index 800e1d0f3..000000000 Binary files a/FaceUnity/src/main/assets/effect/gesture/ctrl_snow.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/gesture/ssd_thread_cute.bundle b/FaceUnity/src/main/assets/effect/gesture/ssd_thread_cute.bundle deleted file mode 100644 index dcdde4ead..000000000 Binary files a/FaceUnity/src/main/assets/effect/gesture/ssd_thread_cute.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/gesture/ssd_thread_korheart.bundle b/FaceUnity/src/main/assets/effect/gesture/ssd_thread_korheart.bundle deleted file mode 100644 index f75d253c9..000000000 Binary files a/FaceUnity/src/main/assets/effect/gesture/ssd_thread_korheart.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/gesture/ssd_thread_six.bundle b/FaceUnity/src/main/assets/effect/gesture/ssd_thread_six.bundle deleted file mode 100644 index 6602d71e0..000000000 Binary files a/FaceUnity/src/main/assets/effect/gesture/ssd_thread_six.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/landmarks.bundle b/FaceUnity/src/main/assets/effect/landmarks.bundle deleted file mode 100644 index 82b1031e3..000000000 Binary files a/FaceUnity/src/main/assets/effect/landmarks.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/musicfilter/douyin_01.bundle b/FaceUnity/src/main/assets/effect/musicfilter/douyin_01.bundle deleted file mode 100644 index d6e31d5e7..000000000 Binary files a/FaceUnity/src/main/assets/effect/musicfilter/douyin_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/musicfilter/douyin_01.mp3 b/FaceUnity/src/main/assets/effect/musicfilter/douyin_01.mp3 deleted file mode 100644 index 16f895789..000000000 Binary files a/FaceUnity/src/main/assets/effect/musicfilter/douyin_01.mp3 and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/musicfilter/douyin_02.bundle b/FaceUnity/src/main/assets/effect/musicfilter/douyin_02.bundle deleted file mode 100644 index 58253544a..000000000 Binary files a/FaceUnity/src/main/assets/effect/musicfilter/douyin_02.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/musicfilter/douyin_02.mp3 b/FaceUnity/src/main/assets/effect/musicfilter/douyin_02.mp3 deleted file mode 100644 index 16f895789..000000000 Binary files a/FaceUnity/src/main/assets/effect/musicfilter/douyin_02.mp3 and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/cat_sparks.bundle b/FaceUnity/src/main/assets/effect/normal/cat_sparks.bundle deleted file mode 100644 index 088b1bdfc..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/cat_sparks.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/daisypig.bundle b/FaceUnity/src/main/assets/effect/normal/daisypig.bundle deleted file mode 100644 index 8c0739f1a..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/daisypig.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/fashi.bundle b/FaceUnity/src/main/assets/effect/normal/fashi.bundle deleted file mode 100644 index 7318669d3..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/fashi.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/fu_zh_fenshu.bundle b/FaceUnity/src/main/assets/effect/normal/fu_zh_fenshu.bundle deleted file mode 100644 index a5f523b7b..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/fu_zh_fenshu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/gaoshiqing.bundle b/FaceUnity/src/main/assets/effect/normal/gaoshiqing.bundle deleted file mode 100644 index 153d019fa..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/gaoshiqing.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/newy1.bundle b/FaceUnity/src/main/assets/effect/normal/newy1.bundle deleted file mode 100644 index a4d86abab..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/newy1.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/redribbt.bundle b/FaceUnity/src/main/assets/effect/normal/redribbt.bundle deleted file mode 100644 index ab5fea384..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/redribbt.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/sdlr.bundle b/FaceUnity/src/main/assets/effect/normal/sdlr.bundle deleted file mode 100644 index ebc18df6d..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/sdlr.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/sdlu.bundle b/FaceUnity/src/main/assets/effect/normal/sdlu.bundle deleted file mode 100644 index fad48d6ec..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/sdlu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/wobushi.bundle b/FaceUnity/src/main/assets/effect/normal/wobushi.bundle deleted file mode 100644 index 3c98927d7..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/wobushi.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/xlong_zh_fu.bundle b/FaceUnity/src/main/assets/effect/normal/xlong_zh_fu.bundle deleted file mode 100644 index 914ad6c4c..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/xlong_zh_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/normal/xueqiu_lm_fu.bundle b/FaceUnity/src/main/assets/effect/normal/xueqiu_lm_fu.bundle deleted file mode 100644 index f6bf32deb..000000000 Binary files a/FaceUnity/src/main/assets/effect/normal/xueqiu_lm_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/segment/bg_segment.bundle b/FaceUnity/src/main/assets/effect/segment/bg_segment.bundle deleted file mode 100644 index ddc65ca20..000000000 Binary files a/FaceUnity/src/main/assets/effect/segment/bg_segment.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/segment/boyfriend1.bundle b/FaceUnity/src/main/assets/effect/segment/boyfriend1.bundle deleted file mode 100644 index 49008e265..000000000 Binary files a/FaceUnity/src/main/assets/effect/segment/boyfriend1.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/segment/boyfriend2.bundle b/FaceUnity/src/main/assets/effect/segment/boyfriend2.bundle deleted file mode 100644 index e3da0418d..000000000 Binary files a/FaceUnity/src/main/assets/effect/segment/boyfriend2.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/segment/boyfriend3.bundle b/FaceUnity/src/main/assets/effect/segment/boyfriend3.bundle deleted file mode 100644 index b07a9bb23..000000000 Binary files a/FaceUnity/src/main/assets/effect/segment/boyfriend3.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/segment/gufeng_zh_fu.bundle b/FaceUnity/src/main/assets/effect/segment/gufeng_zh_fu.bundle deleted file mode 100644 index 120948ebf..000000000 Binary files a/FaceUnity/src/main/assets/effect/segment/gufeng_zh_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/segment/hez_ztt_fu.bundle b/FaceUnity/src/main/assets/effect/segment/hez_ztt_fu.bundle deleted file mode 100644 index 73cd7d3df..000000000 Binary files a/FaceUnity/src/main/assets/effect/segment/hez_ztt_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/segment/human_outline.bundle b/FaceUnity/src/main/assets/effect/segment/human_outline.bundle deleted file mode 100644 index 14adbadac..000000000 Binary files a/FaceUnity/src/main/assets/effect/segment/human_outline.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/segment/ice_lm_fu.bundle b/FaceUnity/src/main/assets/effect/segment/ice_lm_fu.bundle deleted file mode 100644 index 2c41a4a5d..000000000 Binary files a/FaceUnity/src/main/assets/effect/segment/ice_lm_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/segment/sea_lm_fu.bundle b/FaceUnity/src/main/assets/effect/segment/sea_lm_fu.bundle deleted file mode 100644 index d4061c598..000000000 Binary files a/FaceUnity/src/main/assets/effect/segment/sea_lm_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/effect/segment/xiandai_ztt_fu.bundle b/FaceUnity/src/main/assets/effect/segment/xiandai_ztt_fu.bundle deleted file mode 100644 index 67091225e..000000000 Binary files a/FaceUnity/src/main/assets/effect/segment/xiandai_ztt_fu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/color_setup.json b/FaceUnity/src/main/assets/makeup/color_setup.json deleted file mode 100644 index 319525c61..000000000 --- a/FaceUnity/src/main/assets/makeup/color_setup.json +++ /dev/null @@ -1,1170 +0,0 @@ -{ - "color_mu_style_eyebrow_01": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyeshadow_01": { - "color1": [ - 1.0, - 0.43, - 0.44, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color2": [ - 0.88, - 0.32, - 0.32, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color3": [ - 0.90, - 0.55, - 0.36, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color4": [ - 0.78, - 0.24, - 0.37, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color5": [ - 1.0, - 0.42, - 0.49, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - "color_mu_style_eyeshadow_02": { - "color1": [ - 1.0, - 0.72, - 0.36, - 1.0, - 0.93, - 0.45, - 0.25, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color2": [ - 0.89, - 0.61, - 0.41, - 1.0, - 0.86, - 0.26, - 0.07, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color3": [ - 0.98, - 0.75, - 0.52, - 1.0, - 0.66, - 0.28, - 0.23, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color4": [ - 1.0, - 0.58, - 0.40, - 1.0, - 0.72, - 0.38, - 0.14, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color5": [ - 1.0, - 0.62, - 0.55, - 1.0, - 0.56, - 0.17, - 0.17, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - "color_mu_style_eyeshadow_03": { - "color1": [ - 1.0, - 0.72, - 0.36, - 1.0, - 0.93, - 0.45, - 0.25, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color2": [ - 0.89, - 0.61, - 0.41, - 1.0, - 0.86, - 0.26, - 0.07, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color3": [ - 0.98, - 0.75, - 0.52, - 1.0, - 0.66, - 0.28, - 0.23, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color4": [ - 1.0, - 0.58, - 0.40, - 1.0, - 0.72, - 0.38, - 0.14, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color5": [ - 1.0, - 0.62, - 0.55, - 1.0, - 0.56, - 0.17, - 0.17, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - "color_mu_style_eyeshadow_04": { - "color1": [ - 0.82, - 0.15, - 0.24, - 1.0, - 1.0, - 0.92, - 0.74, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color2": [ - 0.88, - 0.32, - 0.32, - 1.0, - 0.97, - 0.86, - 0.78, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color3": [ - 0.90, - 0.55, - 0.36, - 1.0, - 0.98, - 0.8, - 0.76, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color4": [ - 0.78, - 0.24, - 0.37, - 1.0, - 0.92, - 0.91, - 0.84, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "color5": [ - 1.0, - 0.43, - 0.44, - 1.0, - 0.99, - 0.78, - 0.84, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - "color_mu_style_eyeshadow_05": { - "color1": [ - 1.0, - 0.72, - 0.36, - 1.0, - 1.0, - 0.43, - 0.44, - 1.0, - 0.72, - 0.38, - 0.15, - 1.0 - ], - "color2": [ - 0.89, - 0.61, - 0.41, - 1.0, - 0.78, - 0.24, - 0.37, - 1.0, - 0.56, - 0.17, - 0.17, - 1.0 - ], - "color3": [ - 0.98, - 0.75, - 0.52, - 1.0, - 0.90, - 0.55, - 0.36, - 1.0, - 0.93, - 0.45, - 0.25, - 1.0 - ], - "color4": [ - 1.0, - 0.58, - 0.40, - 1.0, - 0.88, - 0.32, - 0.32, - 1.0, - 0.66, - 0.28, - 0.23, - 1.0 - ], - "color5": [ - 1.0, - 0.62, - 0.55, - 1.0, - 1.0, - 0.42, - 0.49, - 1.0, - 0.86, - 0.26, - 0.07, - 1.0 - ] - }, - "color_mu_style_eyeshadow_06": { - "color1": [ - 1.0, - 0.43, - 0.44, - 1.0, - 0.66, - 0.28, - 0.23, - 1.0, - 1.0, - 0.92, - 0.74, - 1.0 - ], - "color2": [ - 0.88, - 0.32, - 0.32, - 1.0, - 0.69, - 0.25, - 0.25, - 1.0, - 0.98, - 0.8, - 0.76, - 1.0 - ], - "color3": [ - 0.90, - 0.55, - 0.36, - 1.0, - 0.72, - 0.38, - 0.15, - 1.0, - 0.97, - 0.86, - 0.78, - 1.0 - ], - "color4": [ - 1.0, - 0.58, - 0.40, - 1.0, - 0.56, - 0.17, - 0.17, - 1.0, - 0.99, - 0.78, - 0.84, - 1.0 - ], - "color5": [ - 1.0, - 0.62, - 0.55, - 1.0, - 0.86, - 0.26, - 0.07, - 1.0, - 0.92, - 0.91, - 0.84, - 1.0 - ] - }, - "color_mu_style_eyelash_01": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyelash_02": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyelash_03": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyelash_04": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyelash_05": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyelash_06": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyeliner_01": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyeliner_02": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyeliner_03": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyeliner_04": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyeliner_05": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyeliner_06": { - "color1": [ - 0.36, - 0.10, - 0.10, - 1.0 - ], - "color2": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "color3": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "color4": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "color5": [ - 0.31, - 0.17, - 0.22, - 1.0 - ] - }, - "color_mu_style_foundation_01": { - "color1": [ - 0.82, - 0.71, - 0.62, - 1.0 - ], - "color2": [ - 0.87, - 0.74, - 0.69, - 1.0 - ], - "color3": [ - 0.91, - 0.81, - 0.74, - 1.0 - ], - "color4": [ - 0.8, - 0.74, - 0.65, - 1.0 - ], - "color5": [ - 0.74, - 0.62, - 0.56, - 1.0 - ] - }, - "color_mu_style_highlight_01": { - "color1": [ - 0.98, - 0.95, - 0.94, - 1.0 - ], - "color2": [ - 1.0, - 0.97, - 0.93, - 1.0 - ], - "color3": [ - 1.0, - 0.96, - 0.93, - 1.0 - ], - "color4": [ - 0.97, - 0.95, - 0.95, - 1.0 - ], - "color5": [ - 0.99, - 0.98, - 0.95, - 1.0 - ] - }, - "color_mu_style_highlight_02": { - "color1": [ - 0.98, - 0.95, - 0.94, - 1.0 - ], - "color2": [ - 1.0, - 0.97, - 0.93, - 1.0 - ], - "color3": [ - 1.0, - 0.96, - 0.93, - 1.0 - ], - "color4": [ - 0.97, - 0.95, - 0.95, - 1.0 - ], - "color5": [ - 0.99, - 0.98, - 0.95, - 1.0 - ] - }, - "color_mu_style_blush_01": { - "color1": [ - 0.96, - 0.44, - 0.42, - 1.0 - ], - "color2": [ - 0.93, - 0.35, - 0.43, - 1.0 - ], - "color3": [ - 0.89, - 0.26, - 0.28, - 1.0 - ], - "color4": [ - 0.89, - 0.26, - 0.40, - 1.0 - ], - "color5": [ - 1.0, - 0.39, - 0.32, - 1.0 - ] - }, - "color_mu_style_blush_02": { - "color1": [ - 0.96, - 0.44, - 0.42, - 1.0 - ], - "color2": [ - 0.93, - 0.35, - 0.43, - 1.0 - ], - "color3": [ - 0.89, - 0.26, - 0.28, - 1.0 - ], - "color4": [ - 0.89, - 0.26, - 0.40, - 1.0 - ], - "color5": [ - 1.0, - 0.39, - 0.32, - 1.0 - ] - }, - "color_mu_style_blush_03": { - "color1": [ - 0.96, - 0.44, - 0.42, - 1.0 - ], - "color2": [ - 0.93, - 0.35, - 0.43, - 1.0 - ], - "color3": [ - 0.89, - 0.26, - 0.28, - 1.0 - ], - "color4": [ - 0.89, - 0.26, - 0.40, - 1.0 - ], - "color5": [ - 1.0, - 0.39, - 0.32, - 1.0 - ] - }, - "color_mu_style_blush_04": { - "color1": [ - 0.96, - 0.44, - 0.42, - 1.0 - ], - "color2": [ - 0.93, - 0.35, - 0.43, - 1.0 - ], - "color3": [ - 0.89, - 0.26, - 0.28, - 1.0 - ], - "color4": [ - 0.89, - 0.26, - 0.40, - 1.0 - ], - "color5": [ - 1.0, - 0.39, - 0.32, - 1.0 - ] - }, - "color_mu_style_contour_01": { - "color1": [ - 0.33, - 0.16, - 0.09, - 1.0 - ], - "color2": [ - 0.41, - 0.22, - 0.15, - 1.0 - ], - "color3": [ - 0.34, - 0.1, - 0.1, - 1.0 - ], - "color4": [ - 0.4, - 0.12, - 0.18, - 1.0 - ], - "color5": [ - 0.32, - 0.23, - 0.16, - 1.0 - ] - }, - "color_mu_style_lip_01": { - "color1": [ - 0.60, - 0.16, - 0.16, - 1.0 - ], - "color2": [ - 0.84, - 0.16, - 0.27, - 1.0 - ], - "color3": [ - 0.84, - 0.26, - 0.16, - 1.0 - ], - "color4": [ - 0.60, - 0.11, - 0.23, - 1.0 - ], - "color5": [ - 0.81, - 0.31, - 0.22, - 1.0 - ] - }, - "color_mu_style_eyepupil_01": { - "color1": [ - 0.33, - 0.13, - 0.06, - 1.0 - ], - "color2": [ - 0.61, - 0.18, - 0.25, - 1.0 - ], - "color3": [ - 0.73, - 0.51, - 0.11, - 1.0 - ], - "color4": [ - 0.13, - 0.72, - 0.72, - 1.0 - ], - "color5": [ - 0.39, - 0.64, - 0.43, - 1.0 - ] - } -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/chaoa.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/chaoa.bundle deleted file mode 100644 index 6d6f3482d..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/chaoa.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/chaomo.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/chaomo.bundle deleted file mode 100644 index 1fe066467..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/chaomo.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/chuju.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/chuju.bundle deleted file mode 100644 index e305fb652..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/chuju.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/chuqiu.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/chuqiu.bundle deleted file mode 100644 index 44ee9310f..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/chuqiu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/diadiatu.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/diadiatu.bundle deleted file mode 100644 index 89a9e82cb..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/diadiatu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/dongling.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/dongling.bundle deleted file mode 100644 index 32d298843..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/dongling.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/dousha.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/dousha.bundle deleted file mode 100644 index 268fd7fed..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/dousha.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/gangfeng.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/gangfeng.bundle deleted file mode 100644 index a8122028f..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/gangfeng.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/guofeng.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/guofeng.bundle deleted file mode 100644 index 7accb7084..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/guofeng.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/hongfeng.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/hongfeng.bundle deleted file mode 100644 index ef4791e7d..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/hongfeng.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/hunxie.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/hunxie.bundle deleted file mode 100644 index dadea8d79..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/hunxie.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/jianling.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/jianling.bundle deleted file mode 100644 index a2c29b49b..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/jianling.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/linjia.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/linjia.bundle deleted file mode 100644 index 205476c8c..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/linjia.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/naicha.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/naicha.bundle deleted file mode 100644 index 73dd2bf5b..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/naicha.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/nuandong.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/nuandong.bundle deleted file mode 100644 index 2d3f202af..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/nuandong.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/oumei.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/oumei.bundle deleted file mode 100644 index c2aaee19a..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/oumei.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/qianzhihe.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/qianzhihe.bundle deleted file mode 100644 index 8b01613b4..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/qianzhihe.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/renyu.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/renyu.bundle deleted file mode 100644 index 9d1a0e314..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/renyu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/rose.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/rose.bundle deleted file mode 100644 index c5292c559..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/rose.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/shaonv.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/shaonv.bundle deleted file mode 100644 index 1525c841b..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/shaonv.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/tianmei.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/tianmei.bundle deleted file mode 100644 index 252c9d35b..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/tianmei.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/wumei.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/wumei.bundle deleted file mode 100644 index 8199e47fd..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/wumei.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/xinggan.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/xinggan.bundle deleted file mode 100644 index 18055a693..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/xinggan.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/yanshimao.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/yanshimao.bundle deleted file mode 100644 index cd8c16f4a..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/yanshimao.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/combination_bundle/ziyun.bundle b/FaceUnity/src/main/assets/makeup/combination_bundle/ziyun.bundle deleted file mode 100644 index e3cef9ad0..000000000 Binary files a/FaceUnity/src/main/assets/makeup/combination_bundle/ziyun.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/config_json/chaomo.json b/FaceUnity/src/main/assets/makeup/config_json/chaomo.json deleted file mode 100644 index 053bd9622..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/chaomo.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 0.800000011920929, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 1.0, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 1.0, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 0.9882352948188782, - 0.95686274766922, - 0.9372549057006836, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 1.0, - "makeup_lip_color": [ - 0.501960813999176, - 0.10196078568696976, - 0.10196078568696976, - 1.0 - ], - "lip_type": 0, - "makeup_intensity_lip": 1.0, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/chuju.json b/FaceUnity/src/main/assets/makeup/config_json/chuju.json deleted file mode 100644 index 909d1f1ec..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/chuju.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 0.800000011920929, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 0.800000011920929, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 0.699999988079071, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.6000000238418579, - "makeup_lip_color": [ - 0.6509804129600525, - 0.3019607961177826, - 0.250980406999588, - 1.0 - ], - "lip_type": 0, - "makeup_intensity_lip": 0.8999999761581421, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/chuqiu.json b/FaceUnity/src/main/assets/makeup/config_json/chuqiu.json deleted file mode 100644 index d6a8201a6..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/chuqiu.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 1.0, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 1.0, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 1.0, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 0.9882352948188782, - 0.9647058844566345, - 0.9490196108818054, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 0.800000011920929, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.6000000238418579, - "makeup_lip_color": [ - 0.7215686440467835, - 0.2705882489681244, - 0.18039216101169587, - 1.0 - ], - "lip_type": 0, - "makeup_intensity_lip": 0.8999999761581421, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/diadiatu.json b/FaceUnity/src/main/assets/makeup/config_json/diadiatu.json deleted file mode 100644 index 51df2ff45..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/diadiatu.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "makeup_eyelash_color": [ - 0.3333333432674408, - 0.1921568661928177, - 0.1568627506494522, - 1.0 - ], - "tex_eyelash": "eyelash03.png", - "makeup_intensity_eyelash": 0.699999988079071, - "makeup_name": "Group_1_25", - "makeup_eyeBrow_color": [ - 0.5254902243614197, - 0.45098039507865906, - 0.32156863808631897, - 1.0 - ], - "tex_eyeBrow": "brow6.png", - "brow_warp": 0.0, - "brow_warp_type": 0, - "use_brow_v2": 1, - "makeup_intensity_eyeBrow": 0.800000011920929, - "makeup_eyeLiner_color": [ - 0.5098039507865906, - 0.30588236451148987, - 0.2549019753932953, - 1.0 - ], - "tex_eyeLiner": "eyeliner04.png", - "makeup_intensity_eyeLiner": 0.75, - "blend_type_tex_eye": 1, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "makeup_eye_color2": [ - 0.47843137383461, - 0.24313725531101227, - 0.2235294133424759, - 1.0 - ], - "makeup_eye_color3": [ - 0.49803921580314636, - 0.20392157137393951, - 0.1921568661928177, - 1.0 - ], - "tex_eye": "eye11.png", - "tex_eye2": "eye66.png", - "tex_eye3": "eye33.png", - "makeup_intensity_eye": 0.6000000238418579, - "makeup_pupil_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_pupil": "美瞳3.png", - "makeup_intensity_pupil": 0.800000011920929, - "makeup_lip_color": [ - 0.7254902124404907, - 0.16862745583057404, - 0.2235294133424759, - 1.0 - ], - "is_two_color": 0, - "tex_lip_mask_zz": "mask1.png", - "tex_lip_mask_bz": "mask.png", - "lip_type": 0, - "makeup_intensity_lip": 0.949999988079071, - "blend_type_tex_blusher": 1, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "mu_style_highlight_02.png", - "makeup_intensity_highlight": 0.699999988079071, - "makeup_shadow_color": [ - 0.7019608020782471, - 0.3764705955982208, - 0.29411765933036804, - 1.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 1.0, - "use_eye_v2": 1 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/dongling.json b/FaceUnity/src/main/assets/makeup/config_json/dongling.json deleted file mode 100644 index 42961b8a1..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/dongling.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "makeup_lip_color": [ - 0.6784313917160034, - 0.0470588244497776, - 0.24705882370471954, - 1.0 - ], - "makeup_lip_color_v2": [ - 0.6784313917160034, - 0.0470588244497776, - 0.24705882370471954, - 1.0 - ], - "makeup_lip_color_mix_strength": 0.6000000238418579, - "makeup_lip_highlight_strength": 0.800000011920929, - "makeup_lip_highlight_enable": 1, - "tex_lip_mask_zz": "mask1.png", - "tex_lip_mask_bz": "mask.png", - "lip_type": 7, - "makeup_intensity_lip": 0.8999999761581421, - "makeup_name": "Group_1_13", - "blend_type_tex_eye": 1, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 0, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.800000011920929, - 0.10980392247438431, - 0.3294117748737335, - 1.0 - ], - "tex_eye": "eye1.png", - "tex_eye2": "eye_2.png", - "makeup_intensity_eye": 0.8999999761581421, - "makeup_pupil_color": [ - 0.5882353186607361, - 0.5921568870544434, - 0.43921568989753723, - 1.0 - ], - "tex_pupil": "eyepupil.png", - "makeup_intensity_pupil": 1.0, - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 1.0, - 0.11372549086809158, - 0.45490196347236633, - 1.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 0.800000011920929, - "makeup_foundation_color": [ - 0.8627451062202454, - 0.7803921699523926, - 0.7803921699523926, - 1.0 - ], - "tex_foundation": "zhuangrong_fd.png", - "makeup_intensity_foundation": 0.800000011920929, - "makeup_eyelash_color": [ - 0.38823530077934265, - 0.12941177189350128, - 0.21176470816135406, - 1.0 - ], - "tex_eyelash": "eyeLash.png", - "makeup_intensity_eyelash": 0.6000000238418579, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.800000011920929, - "makeup_eyeBrow_color": [ - 0.3176470696926117, - 0.24705882370471954, - 0.22745098173618317, - 1.0 - ], - "tex_eyeBrow": "brow6.png", - "brow_warp": 0.0, - "brow_warp_type": 6, - "use_brow_v2": 1, - "makeup_intensity_eyeBrow": 0.800000011920929, - "makeup_eyeLiner_color": [ - 0.5411764979362488, - 0.14509804546833038, - 0.2705882489681244, - 1.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 0.25, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "mu_style_highlight_01.png", - "makeup_intensity_highlight": 0.800000011920929, - "use_eye_v2": 1 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/gangfeng.json b/FaceUnity/src/main/assets/makeup/config_json/gangfeng.json deleted file mode 100644 index 28575a85d..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/gangfeng.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 1.0, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 0.800000011920929, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 0.800000011920929, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 0.8999999761581421, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.800000011920929, - "makeup_lip_color": [ - 0.5803921818733215, - 0.25882354378700259, - 0.20000000298023225, - 1.0 - ], - "lip_type": 0, - "makeup_intensity_lip": 0.800000011920929, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/guofeng.json b/FaceUnity/src/main/assets/makeup/config_json/guofeng.json deleted file mode 100644 index 9dd3167ee..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/guofeng.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "makeup_eyelash_color": [ - 0.6117647290229797, - 0.4313725531101227, - 0.12156862765550613, - 1.0 - ], - "tex_eyelash": "eyeLash03.png", - "makeup_intensity_eyelash": 0.550000011920929, - "makeup_name": "Group_1_25", - "makeup_eyeBrow_color": [ - 0.5254902243614197, - 0.45098039507865906, - 0.32156863808631897, - 1.0 - ], - "tex_eyeBrow": "brow6.png", - "brow_warp": 0.0, - "brow_warp_type": 0, - "use_brow_v2": 1, - "makeup_intensity_eyeBrow": 0.800000011920929, - "makeup_eyeLiner_color": [ - 0.4627451002597809, - 0.35686275362968445, - 0.20392157137393951, - 1.0 - ], - "tex_eyeLiner": "eyeLiner03.png", - "makeup_intensity_eyeLiner": 0.5, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.6705882549285889, - 0.3529411852359772, - 0.19607843458652496, - 1.0 - ], - "tex_eye": "eye03.png", - "makeup_intensity_eye": 0.8500000238418579, - "makeup_lip_color": [ - 0.5490196347236633, - 0.0, - 0.007843137718737125, - 1.0 - ], - "is_two_color": 0, - "tex_lip_mask_zz": "GF1015-5zz.png", - "tex_lip_mask_bz": "GF1015-5.png", - "lip_type": 0, - "makeup_intensity_lip": 1.0, - "blend_type_tex_blusher": 1, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 1.0, - 0.2549019753932953, - 0.27843138575553894, - 1.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 0.30000001192092896, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "mu_style_highlight_02.png", - "makeup_intensity_highlight": 0.550000011920929, - "makeup_foundation_color": [ - 0.6705882549285889, - 0.47058823704719543, - 0.4431372582912445, - 1.0 - ], - "tex_foundation": "zhuangrong_fd.png", - "makeup_intensity_foundation": 0.6000000238418579, - "makeup_shadow_color": [ - 0.5333333611488342, - 0.3294117748737335, - 0.29019609093666077, - 1.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.25, - "makeup_pupil_color": [ - 0.4745098054409027, - 0.42352941632270813, - 0.3960784375667572, - 1.0 - ], - "tex_pupil": "icon_style_eyepupil_03.png", - "makeup_intensity_pupil": 0.5, - "use_eye_v2": 1 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/hongfeng.json b/FaceUnity/src/main/assets/makeup/config_json/hongfeng.json deleted file mode 100644 index 900f4ece0..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/hongfeng.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 1.0, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 0.699999988079071, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 0.800000011920929, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 1.0, - "makeup_lip_color": [ - 0.5803921818733215, - 0.250980406999588, - 0.21960784494876862, - 1.0 - ], - "lip_type": 1, - "makeup_intensity_lip": 1.0, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/hunxie.json b/FaceUnity/src/main/assets/makeup/config_json/hunxie.json deleted file mode 100644 index 1d9a461a3..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/hunxie.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "makeup_lip_color": [ - 0.3764705955982208, - 0.0, - 0.0, - 1.0 - ], - "makeup_lip_color_v2": [ - 0.3764705955982208, - 0.0, - 0.0, - 1.0 - ], - "makeup_lip_color_mix_strength": 0.0, - "makeup_lip_highlight_strength": 0.30000001192092896, - "makeup_lip_highlight_enable": 1, - "tex_lip_mask_zz": "HX1015-3-zz.png", - "tex_lip_mask_bz": "HX1015-3.png", - "lip_type": 7, - "makeup_intensity_lip": 0.8500000238418579, - "makeup_name": "Group_1_8", - "blend_type_tex_eye": 1, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 0, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.47843137383461, - 0.24313725531101227, - 0.2235294133424759, - 1.0 - ], - "makeup_eye_color3": [ - 0.6941176652908325, - 0.3490196168422699, - 0.32156863808631897, - 1.0 - ], - "makeup_eye_color4": [ - 0.6784313917160034, - 0.34117648005485535, - 0.29411765933036804, - 1.0 - ], - "tex_eye": "eye11.png", - "tex_eye2": "eye3.png", - "tex_eye3": "eye66.png", - "tex_eye4": "eye04.png", - "makeup_intensity_eye": 1.0, - "makeup_eyelash_color": [ - 0.4274509847164154, - 0.2666666805744171, - 0.21568627655506134, - 1.0 - ], - "tex_eyelash": "eyelash03.png", - "makeup_intensity_eyelash": 0.8500000238418579, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "mu_style_highlight_02_2.png", - "makeup_intensity_highlight": 0.30000001192092896, - "makeup_eyeLiner_color": [ - 0.4745098054409027, - 0.30980393290519714, - 0.24313725531101227, - 1.0 - ], - "tex_eyeLiner": "eyeLiner04.png", - "makeup_intensity_eyeLiner": 0.800000011920929, - "makeup_pupil_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_pupil": "eyepupil.png", - "makeup_intensity_pupil": 0.550000011920929, - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 1.0, - "makeup_eyeBrow_color": [ - 0.5176470875740051, - 0.47843137383461, - 0.3803921639919281, - 1.0 - ], - "tex_eyeBrow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 6, - "use_brow_v2": 1, - "makeup_intensity_eyeBrow": 0.8999999761581421, - "makeup_shadow_color": [ - 0.7450980544090271, - 0.4745098054409027, - 0.4274509847164154, - 1.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.4000000059604645, - "use_eye_v2": 1 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/jianling.json b/FaceUnity/src/main/assets/makeup/config_json/jianling.json deleted file mode 100644 index ce49b961e..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/jianling.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 0.8999999761581421, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 1.0, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 0.699999988079071, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.699999988079071, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.699999988079071, - "makeup_lip_color": [ - 0.6509804129600525, - 0.21176470816135407, - 0.29019609093666079, - 1.0 - ], - "lip_type": 0, - "makeup_intensity_lip": 0.800000011920929, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/linjia.json b/FaceUnity/src/main/assets/makeup/config_json/linjia.json deleted file mode 100644 index f0eb25871..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/linjia.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.89, - 0.26, - 0.28, - 1.0 - ], - "tex_blusher": "mu_style_blush_01.bundle", - "makeup_intensity_blusher": 1.0, - "makeup_eyeBrow_color": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "tex_brow": "mu_style_eyebrow_01.bundle", - "makeup_intensity_eyeBrow": 0.20000000298023225, - "makeup_eyelash_color": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "tex_eyeLash": "mu_style_eyelash_01.bundle", - "makeup_intensity_eyelash": 0.699999988079071, - "makeup_eyeLiner_color": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "tex_eyeLiner": "mu_style_eyeliner_06.bundle", - "makeup_intensity_eyeLiner": 0.699999988079071, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 0, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 1.0, - 0.72, - 0.36, - 1.0 - ], - "makeup_eye_color2": [ - 0.93, - 0.45, - 0.25, - 1.0 - ], - "tex_eye": "mu_style_eyeshadow_02.bundle", - "makeup_intensity_eye": 0.8999999761581421, - "makeup_foundation_color": [ - 0.91, - 0.81, - 0.74, - 1.0 - ], - "tex_foundation": "mu_style_foundation_01.bundle", - "makeup_intensity_foundation": 1.0, - "makeup_lip_color": [ - 0.84, - 0.26, - 0.16, - 1.0 - ], - "lip_type": 0, - "is_two_color": 0, - "makeup_intensity_lip": 0.6000000238418579 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/nuandong.json b/FaceUnity/src/main/assets/makeup/config_json/nuandong.json deleted file mode 100644 index c9858ec32..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/nuandong.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 1, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_blusher_color2": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "tex_blusher2": "zhuangrong_sh2.png", - "makeup_intensity_blusher": 0.699999988079071, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 0.8999999761581421, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 0.800000011920929, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 1.0, - "makeup_lip_color": [ - 0.5803921818733215, - 0.20000000298023225, - 0.10196078568696976, - 1.0 - ], - "lip_type": 0, - "makeup_intensity_lip": 0.800000011920929, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/oumei.json b/FaceUnity/src/main/assets/makeup/config_json/oumei.json deleted file mode 100644 index 4d42e7950..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/oumei.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.89, - 0.26, - 0.40, - 1.0 - ], - "tex_blusher": "mu_style_blush_02.bundle", - "makeup_intensity_blusher": 1.0, - "makeup_eyeBrow_color": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "tex_brow": "mu_style_eyebrow_01.bundle", - "makeup_intensity_eyeBrow": 0.5, - "makeup_eyelash_color": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "tex_eyeLash": "mu_style_eyelash_06.bundle", - "makeup_intensity_eyelash": 0.6000000238418579, - "makeup_eyeLiner_color": [ - 0.21, - 0.05, - 0.02, - 1.0 - ], - "tex_eyeLiner": "mu_style_eyeliner_05.bundle", - "makeup_intensity_eyeLiner": 0.4000000059604645, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 1, - "blend_type_tex_eye3": 0, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.82, - 0.15, - 0.24, - 1.0 - ], - "makeup_eye_color2": [ - 1.0, - 0.92, - 0.74, - 1.0 - ], - "tex_eye": "mu_style_eyeshadow_04.bundle", - "makeup_intensity_eye": 0.800000011920929, - "makeup_foundation_color": [ - 0.87, - 0.74, - 0.69, - 1.0 - ], - "tex_foundation": "mu_style_foundation_01.bundle", - "makeup_intensity_foundation": 1.0, - "makeup_highlight_color": [ - 0.97, - 0.95, - 0.95, - 1.0 - ], - "tex_highlight": "mu_style_highlight_02.bundle", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.40, - 0.12, - 0.18, - 1.0 - ], - "tex_shadow": "mu_style_contour_01.bundle", - "makeup_intensity_shadow": 1.0, - "makeup_lip_color": [ - 0.6, - 0.11, - 0.23, - 1.0 - ], - "lip_type": 0, - "is_two_color": 0, - "makeup_intensity_lip": 0.8600000143051148 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/qianzhihe.json b/FaceUnity/src/main/assets/makeup/config_json/qianzhihe.json deleted file mode 100644 index 5c91e28c9..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/qianzhihe.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 1.0, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 5, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 0.8999999761581421, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 0.8999999761581421, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 0.8999999761581421, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 1.0, - "makeup_lip_color": [ - 0.5490196347236633, - 0.12156862765550614, - 0.10196078568696976, - 1.0 - ], - "lip_type": 0, - "makeup_intensity_lip": 0.8999999761581421, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/renyu.json b/FaceUnity/src/main/assets/makeup/config_json/renyu.json deleted file mode 100644 index 9f8573ac3..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/renyu.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 1, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_blusher_color2": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "tex_blusher2": "zhuangrong_sh2.png", - "makeup_intensity_blusher": 1.0, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 5, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 1.0, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 1.0, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.800000011920929, - "makeup_lip_color": [ - 0.6000000238418579, - 0.239215686917305, - 0.27843138575553896, - 1.0 - ], - "lip_type": 1, - "makeup_intensity_lip": 0.8999999761581421, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/rose.json b/FaceUnity/src/main/assets/makeup/config_json/rose.json deleted file mode 100644 index fb5798d00..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/rose.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "blend_type_tex_blusher": 1, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 1.0, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 1.0, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 1.0, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 1.0, - "makeup_lip_color": [ - 0.38823530077934267, - 0.18039216101169587, - 0.12941177189350129, - 1.0 - ], - "lip_type": 0, - "makeup_intensity_lip": 1.0, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/shaonv.json b/FaceUnity/src/main/assets/makeup/config_json/shaonv.json deleted file mode 100644 index c3175b81e..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/shaonv.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 0.800000011920929, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.5, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 1.0, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 0.949999988079071, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 0.699999988079071, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.699999988079071, - "makeup_lip_color": [ - 0.5411764979362488, - 0.20000000298023225, - 0.20000000298023225, - 1.0 - ], - "lip_type": 1, - "makeup_intensity_lip": 1.0, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/tianmei.json b/FaceUnity/src/main/assets/makeup/config_json/tianmei.json deleted file mode 100644 index 9b0515cd2..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/tianmei.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.93, - 0.35, - 0.43, - 1.0 - ], - "tex_blusher": "mu_style_blush_04.bundle", - "makeup_intensity_blusher": 1.0, - "makeup_eyeBrow_color": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "tex_brow": "mu_style_eyebrow_01.bundle", - "makeup_intensity_eyeBrow": 0.5, - "makeup_eyeLiner_color": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "tex_eyeLiner": "mu_style_eyeliner_02.bundle", - "makeup_intensity_eyeLiner": 0.5, - "makeup_eyelash_color": [ - 0.33, - 0.09, - 0.18, - 1.0 - ], - "tex_eyeLash": "mu_style_eyelash_02.bundle", - "makeup_intensity_eyelash": 0.5, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 0, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 1.0, - 0.43, - 0.44, - 1.0 - ], - "tex_eye": "mu_style_eyeshadow_01.bundle", - "makeup_intensity_eye": 0.699999988079071, - "makeup_foundation_color": [ - 0.87, - 0.74, - 0.69, - 1.0 - ], - "tex_foundation": "mu_style_foundation_01.bundle", - "makeup_intensity_foundation": 1.0, - "makeup_highlight_color": [ - 1.0, - 0.96, - 0.93, - 1.0 - ], - "tex_highlight": "mu_style_highlight_01.bundle", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.41, - 0.22, - 0.15, - 1.0 - ], - "tex_shadow": "mu_style_contour_01.bundle", - "makeup_intensity_shadow": 1.0, - "makeup_lip_color": [ - 0.84, - 0.16, - 0.27, - 1.0 - ], - "lip_type": 0, - "is_two_color": 0, - "makeup_intensity_lip": 0.5 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/wumei.json b/FaceUnity/src/main/assets/makeup/config_json/wumei.json deleted file mode 100644 index 28d9887aa..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/wumei.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 1.0, - 0.39, - 0.32, - 1.0 - ], - "tex_blusher": "mu_style_blush_03.bundle", - "makeup_intensity_blusher": 1.0, - "makeup_eyeBrow_color": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "tex_brow": "mu_style_eyebrow_01.bundle", - "makeup_intensity_eyeBrow": 0.6000000238418579, - "makeup_eyelash_color": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "tex_eyeLash": "mu_style_eyelash_03.bundle", - "makeup_intensity_eyelash": 0.6000000238418579, - "makeup_eyeLiner_color": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "tex_eyeLiner": "mu_style_eyeliner_03.bundle", - "makeup_intensity_eyeLiner": 0.6000000238418579, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 0, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.89, - 0.61, - 0.41, - 1.0 - ], - "makeup_eye_color2": [ - 0.86, - 0.26, - 0.07, - 1.0 - ], - "tex_eye": "mu_style_eyeshadow_03.bundle", - "makeup_intensity_eye": 0.699999988079071, - "makeup_foundation_color": [ - 0.80, - 0.74, - 0.65, - 1.0 - ], - "tex_foundation": "mu_style_foundation_01.bundle", - "makeup_intensity_foundation": 1.0, - "makeup_highlight_color": [ - 0.99, - 0.98, - 0.95, - 1.0 - ], - "tex_highlight": "mu_style_highlight_01.bundle", - "makeup_intensity_highlight": 1.0, - "makeup_lip_color": [ - 0.81, - 0.31, - 0.22, - 1.0 - ], - "lip_type": 0, - "is_two_color": 0, - "makeup_intensity_lip": 0.699999988079071 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/xinggan.json b/FaceUnity/src/main/assets/makeup/config_json/xinggan.json deleted file mode 100644 index d04d1d0fd..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/xinggan.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.96, - 0.44, - 0.42, - 1.0 - ], - "tex_blusher": "mu_style_blush_02.bundle", - "makeup_intensity_blusher": 1.0, - "makeup_eyeBrow_color": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "tex_brow": "mu_style_eyebrow_01.bundle", - "makeup_intensity_eyeBrow": 0.4000000059604645, - "makeup_eyelash_color": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "tex_eyeLash": "mu_style_eyelash_04.bundle", - "makeup_intensity_eyelash": 0.699999988079071, - "makeup_eyeLiner_color": [ - 0.28, - 0.16, - 0.08, - 1.0 - ], - "tex_eyeLiner": "mu_style_eyeliner_01.bundle", - "makeup_intensity_eyeLiner": 0.6000000238418579, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.88, - 0.32, - 0.32, - 1.0 - ], - "makeup_eye_color2": [ - 0.69, - 0.25, - 0.25, - 1.0 - ], - "makeup_eye_color3": [ - 0.98, - 0.80, - 0.760, - 1.0 - ], - "tex_eye": "mu_style_eyeshadow_06.bundle", - "makeup_intensity_eye": 0.8999999761581421, - "makeup_foundation_color": [ - 0.82, - 0.71, - 0.62, - 1.0 - ], - "tex_foundation": "mu_style_foundation_01.bundle", - "makeup_intensity_foundation": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "mu_style_highlight_02.bundle", - "makeup_intensity_highlight": 0.0, - "makeup_shadow_color": [ - 0.33, - 0.16, - 0.09, - 1.0 - ], - "tex_shadow": "mu_style_contour_01.bundle", - "makeup_intensity_shadow": 1.0, - "makeup_lip_color": [ - 0.60, - 0.16, - 0.16, - 1.0 - ], - "lip_type": 0, - "is_two_color": 0, - "makeup_intensity_lip": 0.800000011920929 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/yanshimao.json b/FaceUnity/src/main/assets/makeup/config_json/yanshimao.json deleted file mode 100644 index 8b1a07c9a..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/yanshimao.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 1, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_blusher_color2": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "tex_blusher2": "zhuangrong_sh2.png", - "makeup_intensity_blusher": 1.0, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 0.699999988079071, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 0.699999988079071, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 0.8999999761581421, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 1.0, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.800000011920929, - "makeup_lip_color": [ - 0.501960813999176, - 0.10980392247438431, - 0.12941177189350129, - 1.0 - ], - "lip_type": 0, - "makeup_intensity_lip": 0.800000011920929, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/config_json/ziyun.json b/FaceUnity/src/main/assets/makeup/config_json/ziyun.json deleted file mode 100644 index 4b52089d3..000000000 --- a/FaceUnity/src/main/assets/makeup/config_json/ziyun.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "blend_type_tex_blusher": 0, - "blend_type_tex_blusher2": 0, - "makeup_blusher_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_blusher_color2": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_blusher": "zhuangrong_sh.png", - "makeup_intensity_blusher": 1.0, - "makeup_brow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_brow": "brow.png", - "brow_warp": 0.0, - "brow_warp_type": 3, - "makeup_intensity_eyeBrow": 0.699999988079071, - "makeup_eyeLash_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLash": "eyeLash.png", - "makeup_intensity_eyelash": 1.0, - "makeup_eyeLiner_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_eyeLiner": "eyeLiner.png", - "makeup_intensity_eyeLiner": 1.0, - "makeup_highlight_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_highlight": "zhuangrong_gg.png", - "makeup_intensity_highlight": 0.800000011920929, - "makeup_shadow_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "tex_shadow": "zhuangrong_yy.png", - "makeup_intensity_shadow": 0.699999988079071, - "makeup_lip_color": [ - 0.5490196347236633, - 0.20000000298023225, - 0.250980406999588, - 1.0 - ], - "lip_type": 1, - "makeup_intensity_lip": 0.8999999761581421, - "blend_type_tex_eye": 0, - "blend_type_tex_eye2": 0, - "blend_type_tex_eye3": 1, - "blend_type_tex_eye4": 0, - "makeup_eye_color": [ - 0.0, - 0.0, - 0.0, - 0.0 - ], - "makeup_eye_color2": [ - 0.5882353186607361, - 0.3607843220233917, - 0.30588236451148989, - 1.0 - ], - "makeup_eye_color3": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "tex_eye": "eye.png", - "tex_eye2": "eye2.png", - "tex_eye3": "eye3.png", - "makeup_intensity_eye": 1.0, - "use_brow_v2": 1.0 -} \ No newline at end of file diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_01.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_01.bundle deleted file mode 100644 index 3cb656c69..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_02.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_02.bundle deleted file mode 100644 index 8d06af48b..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_02.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_03.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_03.bundle deleted file mode 100644 index 78417e58d..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_03.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_04.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_04.bundle deleted file mode 100644 index 03308cdd5..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_blush_04.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_contour_01.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_contour_01.bundle deleted file mode 100644 index d8ffd7ba4..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_contour_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_01.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_01.bundle deleted file mode 100644 index f2a1dc002..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_02.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_02.bundle deleted file mode 100644 index c14b4369f..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_02.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_03.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_03.bundle deleted file mode 100644 index 8c8b45e55..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_03.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_04.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_04.bundle deleted file mode 100644 index d4be845b8..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyebrow_04.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_01.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_01.bundle deleted file mode 100644 index 65dfbe7c3..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_02.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_02.bundle deleted file mode 100644 index 316fef6bb..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_02.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_03.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_03.bundle deleted file mode 100644 index fe2e9882a..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_03.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_04.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_04.bundle deleted file mode 100644 index f44b74cbb..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_04.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_05.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_05.bundle deleted file mode 100644 index be7c2591f..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_05.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_06.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_06.bundle deleted file mode 100644 index d97622b37..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyelash_06.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_01.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_01.bundle deleted file mode 100644 index fb53fc166..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_02.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_02.bundle deleted file mode 100644 index 2630bf965..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_02.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_03.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_03.bundle deleted file mode 100644 index 85fc251a5..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_03.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_04.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_04.bundle deleted file mode 100644 index 56b0b6216..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_04.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_05.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_05.bundle deleted file mode 100644 index 79729a674..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_05.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_06.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_06.bundle deleted file mode 100644 index 88e2417db..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeliner_06.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_01.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_01.bundle deleted file mode 100644 index a2bbcbf5a..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_03.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_03.bundle deleted file mode 100644 index 1295c15f6..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_03.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_04.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_04.bundle deleted file mode 100644 index d3f172018..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_04.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_05.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_05.bundle deleted file mode 100644 index f66543bc2..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_05.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_06.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_06.bundle deleted file mode 100644 index f40ca1f4c..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_06.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_07.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_07.bundle deleted file mode 100644 index 55a1e3c45..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_07.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_08.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_08.bundle deleted file mode 100644 index 9534ec5e0..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_08.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_09.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_09.bundle deleted file mode 100644 index b6199cd8e..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyepupil_09.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_01.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_01.bundle deleted file mode 100644 index bd0732fe0..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_02.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_02.bundle deleted file mode 100644 index 54c25d9b3..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_02.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_03.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_03.bundle deleted file mode 100644 index 973e4d0a2..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_03.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_04.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_04.bundle deleted file mode 100644 index adfb9f5e8..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_04.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_05.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_05.bundle deleted file mode 100644 index c110d66ac..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_05.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_06.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_06.bundle deleted file mode 100644 index a795ba791..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_eyeshadow_06.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_foundation_01.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_foundation_01.bundle deleted file mode 100644 index 3932a45e7..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_foundation_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_highlight_01.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_highlight_01.bundle deleted file mode 100644 index 87d8dbf89..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_highlight_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_highlight_02.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_highlight_02.bundle deleted file mode 100644 index 7ed3b7520..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_highlight_02.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_01.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_01.bundle deleted file mode 100644 index ce5625d84..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_01.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_02.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_02.bundle deleted file mode 100644 index 410086a3c..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_02.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_03.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_03.bundle deleted file mode 100644 index 503dc3728..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_03.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_04.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_04.bundle deleted file mode 100644 index 63a2d7e14..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_04.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_05.bundle b/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_05.bundle deleted file mode 100644 index fd3c071a6..000000000 Binary files a/FaceUnity/src/main/assets/makeup/item_bundle/mu_style_lip_05.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/sticker/fashi.bundle b/FaceUnity/src/main/assets/sticker/fashi.bundle deleted file mode 100644 index 7318669d3..000000000 Binary files a/FaceUnity/src/main/assets/sticker/fashi.bundle and /dev/null differ diff --git a/FaceUnity/src/main/assets/sticker/sdlu.bundle b/FaceUnity/src/main/assets/sticker/sdlu.bundle deleted file mode 100644 index fad48d6ec..000000000 Binary files a/FaceUnity/src/main/assets/sticker/sdlu.bundle and /dev/null differ diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java b/FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java index e81d12597..b73b3e256 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java @@ -11,9 +11,6 @@ import android.hardware.SensorManager; import android.os.Environment; import android.util.Log; -import androidx.annotation.NonNull; - -import com.faceunity.core.callback.OperateCallback; import com.faceunity.core.entity.FURenderOutputData; import com.faceunity.core.enumeration.CameraFacingEnum; import com.faceunity.core.enumeration.FUAIProcessorEnum; @@ -21,13 +18,10 @@ import com.faceunity.core.enumeration.FUAITypeEnum; import com.faceunity.core.enumeration.FUInputTextureEnum; import com.faceunity.core.enumeration.FUTransformMatrixEnum; import com.faceunity.core.faceunity.FUAIKit; -import com.faceunity.core.faceunity.FURenderManager; import com.faceunity.core.utils.CameraUtils; -import com.faceunity.core.utils.FULogger; import com.yunbao.faceunity.data.FaceUnityDataFactory; import com.yunbao.faceunity.listener.FURendererListener; import com.yunbao.faceunity.ui.FaceUnityView; -import com.yunbao.faceunity.utils.Authpack; import com.yunbao.faceunity.utils.CSVUtils; import com.yunbao.faceunity.utils.FURenderer; import com.yunbao.faceunity.utils.FaceUnityData; @@ -50,6 +44,7 @@ public class FaceManager implements SensorEventListener { private static final String TAG = FaceManager.class.getSimpleName(); private FaceUnityDataFactory mFaceUnityDataFactory; private FaceManager.FaceStatusChanged faceStatusChanged; + private boolean pauseFace = false; /** * 初始化美颜模块，在AppContext中调用 @@ -60,20 +55,8 @@ public class FaceManager implements SensorEventListener { } FaceUnityData.mApplication = context; OkHttpUtils.getInstance().init(context, false); - FURenderManager.setCoreDebug(FULogger.LogLevel.OFF); - FURenderManager.setKitDebug(FULogger.LogLevel.OFF); - FURenderManager.registerFURender(context, Authpack.A(), new OperateCallback() { - @Override - public void onSuccess(int i, @NonNull String s) { - isInit = true; - } - - @Override - public void onFail(int i, @NonNull String s) { - - } - }); - + FURenderer.getInstance().setup(context); + isInit = true; } private FURenderer mFURenderer; @@ -82,7 +65,7 @@ public class FaceManager implements SensorEventListener { * 配置美颜SDK */ public void initFURender(Context context) { - FURenderer.getInstance().setup(context); + mFURenderer = FURenderer.getInstance(); mFURenderer.setInputTextureType(FUInputTextureEnum.FU_ADM_FLAG_COMMON_TEXTURE); mFURenderer.setCameraFacing(CameraFacingEnum.CAMERA_FRONT); @@ -98,6 +81,24 @@ public class FaceManager implements SensorEventListener { mSensorManager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_NORMAL); } + /** + * 注册长按对比键事件 + * @param faceUnityView + */ + public void setFaceUnityView(FaceUnityView faceUnityView) { + faceUnityView.setIFaceUnityInter(new FaceUnityView.IFaceUnityInter() { + @Override + public void onPause() { + pauseFace = true; + } + + @Override + public void onStart() { + pauseFace = false; + } + }); + } + /** * 监听人脸识别个数 */ @@ -120,6 +121,9 @@ public class FaceManager implements SensorEventListener { @Override public RCRTCVideoFrame processVideoFrame(RCRTCVideoFrame callVideoFrame) { //Log.i(TAG, "processVideoFrame: egl context " + EGL14.eglGetCurrentContext()); + if (pauseFace) { + return callVideoFrame; + } int width = callVideoFrame.getWidth(); int height = callVideoFrame.getHeight(); diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/AnimViewHolder.java b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/AnimViewHolder.java index 748542fd0..9b099352d 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/AnimViewHolder.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/AnimViewHolder.java @@ -2,6 +2,7 @@ package com.yunbao.faceunity.adapters.vh; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import androidx.annotation.NonNull; @@ -20,6 +21,8 @@ public class AnimViewHolder extends BaseViewHolder { public AnimViewHolder(@NonNull View itemView) { super(itemView); icon = itemView.findViewById(R.id.iv_control); + TextView title = itemView.findViewById(R.id.tv_control); + title.setVisibility(View.GONE); icon.setBackgroundResource(R.drawable.bg_control_square_selector); itemView.setOnClickListener(v -> { adapter.getAnimojiDataFactory().onFilterSelected((AnimationFilterBean) itemView.getTag()); diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/AnimojiViewHolder.java b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/AnimojiViewHolder.java index 090198748..a8350ce76 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/AnimojiViewHolder.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/AnimojiViewHolder.java @@ -2,6 +2,7 @@ package com.yunbao.faceunity.adapters.vh; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import androidx.annotation.NonNull; @@ -17,10 +18,13 @@ import java.util.List; */ public class AnimojiViewHolder extends BaseViewHolder { ImageView icon; + TextView title; public AnimojiViewHolder(@NonNull View itemView) { super(itemView); icon = itemView.findViewById(R.id.iv_control); + title = itemView.findViewById(R.id.tv_control); + title.setVisibility(View.GONE); itemView.setOnClickListener(v -> { adapter.getAnimojiDataFactory().onAnimojiSelected((AnimojiBean) itemView.getTag()); setSelectPosition(getLayoutPosition()); diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/BigHeadViewHolder.java b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/BigHeadViewHolder.java index a79337fbc..3621f53b0 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/BigHeadViewHolder.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/BigHeadViewHolder.java @@ -2,6 +2,7 @@ package com.yunbao.faceunity.adapters.vh; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import androidx.annotation.NonNull; @@ -21,6 +22,8 @@ public class BigHeadViewHolder extends BaseViewHolder { public BigHeadViewHolder(@NonNull View itemView) { super(itemView); icon = itemView.findViewById(R.id.iv_control); + TextView title = itemView.findViewById(R.id.tv_control); + title.setVisibility(View.GONE); itemView.setOnClickListener(v -> { PropBean bean = (PropBean) itemView.getTag(); adapter.getPropDataFactory().setPropType(FunctionEnum.BIG_HEAD); diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/FineStickerViewHolder.java b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/FineStickerViewHolder.java index 52d5c613f..82194c694 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/FineStickerViewHolder.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/FineStickerViewHolder.java @@ -2,6 +2,7 @@ package com.yunbao.faceunity.adapters.vh; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import androidx.annotation.NonNull; @@ -24,6 +25,8 @@ public class FineStickerViewHolder extends BaseViewHolder implements StickerDown public FineStickerViewHolder(@NonNull View itemView) { super(itemView); icon = itemView.findViewById(R.id.iv_control); + TextView title = itemView.findViewById(R.id.tv_control); + title.setVisibility(View.GONE); itemView.setOnClickListener(view -> { FineStickerDataFactory.getInstance().downloadSticker((FineStickerEntity.DocsBean) itemView.getTag()); setSelectPosition(getAdapterPosition()); diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/StickerViewHolder.java b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/StickerViewHolder.java index edc5ba70f..43c00c48d 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/StickerViewHolder.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/StickerViewHolder.java @@ -2,6 +2,7 @@ package com.yunbao.faceunity.adapters.vh; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import androidx.annotation.NonNull; @@ -20,6 +21,8 @@ public class StickerViewHolder extends BaseViewHolder{ public StickerViewHolder(@NonNull View itemView) { super(itemView); icon =itemView.findViewById(R.id.iv_control); + TextView title = itemView.findViewById(R.id.tv_control); + title.setVisibility(View.GONE); itemView.setOnClickListener(v -> { PropBean bean= (PropBean) itemView.getTag(); adapter.getPropDataFactory().setPropType(FunctionEnum.STICKER); diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/ui/FaceUnityView.java b/FaceUnity/src/main/java/com/yunbao/faceunity/ui/FaceUnityView.java index 064872467..ad7d6ee83 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/ui/FaceUnityView.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/ui/FaceUnityView.java @@ -2,6 +2,7 @@ package com.yunbao.faceunity.ui; import android.content.Context; import android.util.AttributeSet; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; @@ -9,6 +10,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -18,9 +20,8 @@ import com.yunbao.faceunity.R; import com.yunbao.faceunity.adapters.ContainerRecyclerAdapter; import com.yunbao.faceunity.adapters.MenuGroupRecyclerAdapter; import com.yunbao.faceunity.data.FaceParam; -import com.yunbao.faceunity.data.FaceUnityDataFactory; -import com.yunbao.faceunity.entity.BaseBean; import com.yunbao.faceunity.data.FineStickerDataFactory; +import com.yunbao.faceunity.entity.BaseBean; import com.yunbao.faceunity.entity.FunctionEnum; import com.yunbao.faceunity.entity.MakeupCustomClassBean; import com.yunbao.faceunity.entity.MenuGroupBean; @@ -52,8 +53,10 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper private TabLayout tabLayout; private TextView title; private LinearLayout menu2, menuDiy, reset, menu2Reset; - private ImageView menu2Back, back, close; + private ImageView menu2Back, back, close, contrast; private DiscreteSeekBar seekBar; + private IFaceUnityInter iFaceUnityInter; + private ConstraintLayout titleLayout; public FaceUnityView(Context context) { super(context); @@ -96,6 +99,8 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper menu2Reset = findViewById(R.id.menu2_reset); menuDiy = findViewById(R.id.menu_diy); seekBar = findViewById(R.id.item_seekBar); + contrast = findViewById(R.id.item_contrast); + titleLayout = findViewById(R.id.titleLayout); initMenuGroup(); setContainerRecycler(new ArrayList<>()); initViewClick(); @@ -107,9 +112,9 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper private void initViewClick() { menu2Back.setOnClickListener(v -> { Object tag = menu2Back.getTag(); - if(tag==null) { + if (tag == null) { goBackMainMenu(); - }else if(tag.equals("makeup")){ + } else if (tag.equals("makeup")) { title.setText(R.string.home_function_name_makeup); title.setVisibility(VISIBLE); menuDiy.setVisibility(VISIBLE); @@ -129,6 +134,25 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper menu2Reset.setOnClickListener(view -> { containerAdapter.reset(); }); + + contrast.setOnTouchListener((v, event) -> { + if (iFaceUnityInter == null) { + return false; + } + if (event.getAction() == KeyEvent.ACTION_DOWN) { + iFaceUnityInter.onPause(); + } else if (event.getAction() == KeyEvent.ACTION_UP) { + iFaceUnityInter.onStart(); + } + return true; + }); + } + + /** + * 对比接口 + */ + public void setIFaceUnityInter(IFaceUnityInter iFaceUnityInter) { + this.iFaceUnityInter = iFaceUnityInter; } /** @@ -137,6 +161,7 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper private void goBackMainMenu() { setContainerRecycler(new ArrayList<>()); title.setText("美顏特效選擇"); + titleLayout.setVisibility(VISIBLE); title.setVisibility(VISIBLE); menu2.setVisibility(GONE); menuGroup.setVisibility(VISIBLE); @@ -363,6 +388,7 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper /** * 设置美颜选项配置行数，图标为5个，拖动条为2个 + * * @param count */ private void changeRecyclerItemCount(int count) { @@ -371,6 +397,7 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper /** * 设置美颜Recycler内容 + * * @param list */ private void setContainerRecycler(ArrayList list) { @@ -380,6 +407,7 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper containerRecycler.setLayoutManager(new GridLayoutManager(mContext, 2)); containerRecycler.setAdapter(containerAdapter); } + titleLayout.setVisibility(title.getVisibility()==GONE?INVISIBLE:VISIBLE); containerAdapter.setList(list); containerAdapter.notifyDataSetChanged(); } @@ -404,4 +432,10 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper public void onDownloadError(FineStickerEntity.DocsBean entity, String msg) { } + + public interface IFaceUnityInter { + void onPause(); + + void onStart(); + } } diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/utils/FURenderer.java b/FaceUnity/src/main/java/com/yunbao/faceunity/utils/FURenderer.java index 313aed9eb..9abb0d32b 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/utils/FURenderer.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/utils/FURenderer.java @@ -87,8 +87,8 @@ public class FURenderer extends IFURenderer { */ @Override public void setup(Context context) { - FURenderManager.setKitDebug(FULogger.LogLevel.TRACE); - FURenderManager.setCoreDebug(FULogger.LogLevel.DEBUG); + FURenderManager.setKitDebug(FULogger.LogLevel.OFF); + FURenderManager.setCoreDebug(FULogger.LogLevel.OFF); FURenderManager.registerFURender(context, Authpack.A(), new OperateCallback() { @Override public void onSuccess(int i, @NotNull String s) { diff --git a/FaceUnity/src/main/res/layout/layout_faceunity.xml b/FaceUnity/src/main/res/layout/layout_faceunity.xml index f24b8d17c..d591b4d19 100644 --- a/FaceUnity/src/main/res/layout/layout_faceunity.xml +++ b/FaceUnity/src/main/res/layout/layout_faceunity.xml @@ -6,28 +6,47 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + + + + + + + + > diff --git a/FaceUnity/src/main/res/layout/list_item_face_config_big_head.xml b/FaceUnity/src/main/res/layout/list_item_face_config_big_head.xml index fe0f3350a..f1b0c0c44 100644 --- a/FaceUnity/src/main/res/layout/list_item_face_config_big_head.xml +++ b/FaceUnity/src/main/res/layout/list_item_face_config_big_head.xml @@ -1,7 +1,7 @@ + android:layout_height="wrap_content"> diff --git a/FaceUnity/src/main/res/layout/list_item_menu_group.xml b/FaceUnity/src/main/res/layout/list_item_menu_group.xml index 2c2947a81..05d23495f 100644 --- a/FaceUnity/src/main/res/layout/list_item_menu_group.xml +++ b/FaceUnity/src/main/res/layout/list_item_menu_group.xml @@ -1,16 +1,16 @@ + android:text="@string/beauty" + android:textColor="#FFFFFF" + android:textSize="12sp" /> \ No newline at end of file diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_baihu.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_baihu.png index 81f7c4c21..55fe1fd08 100644 Binary files a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_baihu.png and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_baihu.png differ diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_cartoon_princess.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_cartoon_princess.png index a25079c02..e26fca915 100644 Binary files a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_cartoon_princess.png and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_cartoon_princess.png differ diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_wuxia.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_wuxia.png index 6d6dc125c..9460ec779 100644 Binary files a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_wuxia.png and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_wuxia.png differ diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_contrast.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_contrast.png new file mode 100644 index 000000000..00d3fe6b6 Binary files /dev/null and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_contrast.png differ diff --git a/app/build.gradle b/app/build.gradle index 5d8cd9bff..9d3603c20 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,6 +6,29 @@ android { dexOptions { jumboMode = true } + /* applicationVariants.all { variant -> + variant.mergeAssetsProvider.configure { + doLast { + delete(fileTree(dir: outputDir, includes: [ + 'model/ai_bgseg_green.bundle', + 'model/ai_face_processor.bundle', + 'model/ai_face_processor_lite.bundle', + 'model/ai_hairseg.bundle', + 'model/ai_hand_processor.bundle', + 'model/ai_human_processor.bundle', + 'model/ai_human_processor_gpu.bundle', + 'model/ai_human_processor_mb_fast.bundle', + 'graphics/body_slim.bundle', + 'graphics/controller_cpp.bundle', + 'graphics/face_beautification.bundle', + 'graphics/face_makeup.bundle', + 'graphics/fuzzytoonfilter.bundle', + 'graphics/fxaa.bundle', + 'graphics/tongue.bundle' + ])) + } + } + }*/ compileSdkVersion rootProject.ext.android.compileSdkVersion buildToolsVersion rootProject.ext.android.buildToolsVersion @@ -54,7 +77,7 @@ android { } packagingOptions {//加上这写代码 为了mob兼容性androidx - pickFirst 'META-INF/*' + // pickFirst 'META-INF/*' } @@ -86,6 +109,7 @@ android { signingConfig signingConfigs.release } debug { + minifyEnabled false signingConfig signingConfigs.release } } @@ -109,8 +133,11 @@ dependencies { api project(':main') //短视频 api project(':video') + annotationProcessor rootProject.ext.dependencies["arouter-compiler"] + // implementation rootProject.ext.dependencies["leakcanary"] + } // 链接包需要注释掉 否正无法更新 谷歌包需要打开 diff --git a/app/src/main/java/com/shayu/phonelive/AppContext.java b/app/src/main/java/com/shayu/phonelive/AppContext.java index 15fb2f802..75281559d 100644 --- a/app/src/main/java/com/shayu/phonelive/AppContext.java +++ b/app/src/main/java/com/shayu/phonelive/AppContext.java @@ -4,16 +4,13 @@ import android.app.Activity; import android.app.ActivityManager; import android.content.Context; import android.net.http.HttpResponseCache; -import android.os.Build; import android.os.Bundle; import android.os.Message; import android.text.TextUtils; import android.util.Log; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; import com.adjust.sdk.Adjust; import com.adjust.sdk.AdjustConfig; @@ -38,7 +35,6 @@ import com.yunbao.common.manager.imrongcloud.MessageIMManager; import com.yunbao.common.manager.imrongcloud.RecommendLiveRoom; import com.yunbao.common.utils.FileUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.faceunity.FaceManager; import com.yunbao.live.views.RecommendLiveRoomProvider; import com.yunbao.common.manager.imrongcloud.RongcloudIMManager; import com.yunbao.common.utils.L; @@ -50,8 +46,6 @@ import com.yunbao.main.activity.MsgSettActivity; import java.io.File; import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.ArrayList; import io.rong.imkit.config.RongConfigCenter; @@ -120,7 +114,7 @@ public class AppContext extends CommonAppContext { public void onCreate() { super.onCreate(); //注册全局异常捕获 - registerError(); + // registerError(); sInstance = this; L.setDeBug(BuildConfig.DEBUG); AppEventsLogger.activateApp(this); @@ -251,7 +245,7 @@ public class AppContext extends CommonAppContext { }); configSPApp(); //初始化美颜SDK - FaceManager.initFaceUnity(this); + // FaceManager.initFaceUnity(this); } /** diff --git a/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java b/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java index 00a795770..cd6a9a9bc 100644 --- a/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java +++ b/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java @@ -94,8 +94,9 @@ public class NeverCrashUtils { if (isDebugMode()) { Log.e(TAG, "未捕获的主线程异常行为", e); } + e.printStackTrace(); Toast.makeText(application, "发生闪退", Toast.LENGTH_SHORT).show(); - FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()),throwableToString(e),"error.log"); + // FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()),throwableToString(e),"error.log"); getMainCrashHandler().mainException(Looper.getMainLooper().getThread(), e); } } @@ -106,6 +107,7 @@ public class NeverCrashUtils { if (isDebugMode()) { Log.e(TAG, "未捕获的子线程异常行为", e); } + e.printStackTrace(); Toast.makeText(application, "发生闪退", Toast.LENGTH_SHORT).show(); FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()),throwableToString(e),"error.log"); getMainCrashHandler().mainException(Looper.getMainLooper().getThread(), e); diff --git a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java index 8f3d5c965..6bfaea32b 100644 --- a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java +++ b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java @@ -386,7 +386,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); imageView.setBackgroundColor(0xffffffff); mImageViewList.add(imageView); - ImgLoader.display(mContext, mAdList.get(i).getUrl(), imageView); + ImgLoader.display(mContext, mAdList.get(i).getUrl(), imageView,480,960); } for (int i = imgSize - 1; i >= 0; i--) { mContainer.addView(mImageViewList.get(i)); @@ -544,7 +544,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL public void onDataUserInfoEvent(DataUserInfoEvent event) { if (event.isUpDataSuccess()) { //融云连接服务器 - RongcloudIMManager.connectIM(this); + RongcloudIMManager.connectIM(getApplication()); forwardMainActivity(); } else { releaseVideo(); diff --git a/build.gradle b/build.gradle index a2d26b2a5..c23bf76cb 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ apply from: "dependencies.gradle" buildscript { - ext.kotlin_version = '1.4.32' + ext.kotlin_version = '1.6.20' repositories { maven { url "https://mvn.mob.com/android" } maven { url 'https://maven.aliyun.com/repository/public' } @@ -16,10 +16,10 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:4.0.2' //一键压缩png工具 - classpath 'com.chenenyu:img-optimizer:1.1.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32" + classpath 'com.chenenyu:img-optimizer:1.3.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20" classpath 'com.google.gms:google-services:4.3.3' } diff --git a/common/build.gradle b/common/build.gradle index 00c597925..36dd76e55 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -66,6 +66,7 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) + compileOnly fileTree(dir: '../libs', include: ['*.aar']) api rootProject.ext.dependencies["appcompat-androidx"] api rootProject.ext.dependencies["recyclerview-androidx"] api rootProject.ext.dependencies["cardview-androidx"] @@ -104,7 +105,8 @@ dependencies { api rootProject.ext.dependencies["gif-drawable"] //svga播放器 - api rootProject.ext.dependencies["SVGAPlayer"] + //api rootProject.ext.dependencies["SVGAPlayer"] + implementation 'com.squareup.wire:wire-runtime:4.4.1' //七牛云存储 api rootProject.ext.dependencies["qiniu-sdk"] diff --git a/common/src/main/java/com/yunbao/common/glide/ImgLoader.java b/common/src/main/java/com/yunbao/common/glide/ImgLoader.java index fc8455924..c814e227c 100644 --- a/common/src/main/java/com/yunbao/common/glide/ImgLoader.java +++ b/common/src/main/java/com/yunbao/common/glide/ImgLoader.java @@ -2,7 +2,9 @@ package com.yunbao.common.glide; import android.app.Activity; import android.content.Context; +import android.graphics.Bitmap; import android.graphics.drawable.Drawable; +import android.media.ThumbnailUtils; import android.net.Uri; import android.text.TextUtils; import android.widget.ImageView; @@ -13,6 +15,7 @@ import androidx.annotation.Nullable; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.CustomTarget; +import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; import com.yunbao.common.R; @@ -33,36 +36,120 @@ public class ImgLoader { sBlurTransformation = new BlurTransformation(25); } - public static void display(Context context, String url, ImageView imageView) { + display(context, url, imageView, -1, -1); + } + + public static void display(Context context, String url, ImageView imageView, int width, int height) { if (!contextIsExist(context)) { return; } - Glide.with(context).asDrawable().load(url).skipMemoryCache(SKIP_MEMORY_CACHE).into(imageView); + Glide.with(context) + .asBitmap() + .load(url) + .skipMemoryCache(SKIP_MEMORY_CACHE) + .into(new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + if (width == -1 || height == -1) { + imageView.setImageBitmap(resource); + } else { + Bitmap bitmap = ThumbnailUtils.extractThumbnail(resource, width, height); + imageView.setImageBitmap(bitmap); + } + } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } + }); } public static void display2(Context context, String url, ImageView imageView) { + display2(context, url, imageView, -1, -1); + } + + /** + * 手动清空内存 + */ + public static void clearMemory(Context context){ + Glide.get(context) + .clearMemory(); + } + public static void display2(Context context, String url, ImageView imageView, int width, int height) { if (!contextIsExist(context)) { return; } - Glide.with(context).asDrawable().load(url).placeholder(imageView.getDrawable()).dontAnimate().skipMemoryCache(SKIP_MEMORY_CACHE).into(imageView); + Glide.with(context) + .asBitmap() + .load(url) + .placeholder(imageView.getDrawable()) + .dontAnimate() + .skipMemoryCache(SKIP_MEMORY_CACHE) + .into(new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + if (width == -1 || height == -1) { + imageView.setImageBitmap(resource); + } else { + Bitmap bitmap = ThumbnailUtils.extractThumbnail(resource, width, height); + imageView.setImageBitmap(bitmap); + } + } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } + }); } public static void display2(Context context, int url, ImageView imageView) { if (!contextIsExist(context)) { return; } - Glide.with(context).asDrawable().load(url).placeholder(imageView.getDrawable()).dontAnimate().skipMemoryCache(SKIP_MEMORY_CACHE).into(imageView); + Glide.with(context) + .asDrawable() + .load(url) + .placeholder(imageView.getDrawable()) + .dontAnimate() + .skipMemoryCache(SKIP_MEMORY_CACHE) + .into(imageView); } public static void displayWithError(Context context, String url, ImageView imageView, int errorRes) { + displayWithError(context, url, imageView, errorRes, -1, -1); + } + + public static void displayWithError(Context context, String url, ImageView imageView, int errorRes, int width, int height) { if (!contextIsExist(context)) { return; } if (imageView == null) { return; } - Glide.with(context).asDrawable().load(url).error(errorRes).skipMemoryCache(SKIP_MEMORY_CACHE).into(imageView); + Glide.with(context) + .asBitmap() + .load(url) + .error(errorRes) + .skipMemoryCache(SKIP_MEMORY_CACHE) + .into(new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + if (width == -1 || height == -1) { + imageView.setImageBitmap(resource); + } else { + Bitmap bitmap = ThumbnailUtils.extractThumbnail(resource, width, height); + imageView.setImageBitmap(bitmap); + } + } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } + }); } public static void displayWithError(Context context, int url, ImageView imageView, int errorRes) { @@ -79,8 +166,34 @@ public class ImgLoader { if (!contextIsExist(context)) { return; } - displayWithError(context, url, imageView, R.mipmap.icon_avatar_placeholder); + displayAvatar(context, url, imageView, -1, -1); + } + public static void displayAvatar(Context context, String url, ImageView imageView, int width, int height) { + if (!contextIsExist(context)) { + return; + } + Glide.with(context) + .asBitmap() + .load(url) + .error(R.mipmap.icon_avatar_placeholder) + .skipMemoryCache(SKIP_MEMORY_CACHE) + .into(new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + if (width == -1 || height == -1) { + imageView.setImageBitmap(resource); + } else { + Bitmap bitmap = ThumbnailUtils.extractThumbnail(resource, width, height); + imageView.setImageBitmap(bitmap); + } + } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } + }); } public static void displayAvatar(Context context, int url, ImageView imageView) { @@ -95,14 +208,22 @@ public class ImgLoader { if (!contextIsExist(context)) { return; } - Glide.with(context).asDrawable().load(file).skipMemoryCache(SKIP_MEMORY_CACHE).into(imageView); + Glide.with(context) + .asDrawable() + .load(file) + .skipMemoryCache(SKIP_MEMORY_CACHE) + .into(imageView); } public static void display(Context context, int res, ImageView imageView) { if (!contextIsExist(context)) { return; } - Glide.with(context).asDrawable().load(res).skipMemoryCache(SKIP_MEMORY_CACHE).into(imageView); + Glide.with(context) + .asDrawable() + .load(res) + .skipMemoryCache(SKIP_MEMORY_CACHE) + .into(imageView); } /** @@ -112,7 +233,11 @@ public class ImgLoader { if (!contextIsExist(context)) { return; } - Glide.with(context).asDrawable().load(Uri.fromFile(new File(videoPath))).skipMemoryCache(SKIP_MEMORY_CACHE).into(imageView); + Glide.with(context) + .asDrawable() + .load(Uri.fromFile(new File(videoPath))) + .skipMemoryCache(SKIP_MEMORY_CACHE) + .into(imageView); } /** @@ -122,7 +247,11 @@ public class ImgLoader { if (!contextIsExist(context)) { return; } - Glide.with(context).asGif().load(videoPath).skipMemoryCache(SKIP_MEMORY_CACHE).into(imageView); + Glide.with(context) + .asGif() + .load(videoPath) + .skipMemoryCache(SKIP_MEMORY_CACHE) + .into(imageView); } public static void displayDrawable(Context context, String url, final DrawableCallback callback) { @@ -143,8 +272,9 @@ public class ImgLoader { @Override public void onLoadFailed(@Nullable Drawable errorDrawable) { super.onLoadFailed(errorDrawable); - if (callback != null) + if (callback != null) { callback.onLoadFailed(); + } } @Override @@ -173,7 +303,9 @@ public class ImgLoader { @Override public void onLoadCleared(@Nullable Drawable placeholder) { - + if (callback != null) { + callback.onLoadFailed(); + } } }); } @@ -190,27 +322,67 @@ public class ImgLoader { * 显示模糊的毛玻璃图片 */ public static void displayBlur(Context context, String url, ImageView imageView) { + displayBlur(context, url, imageView, -1, -1); + } + + public static void displayBlur(Context context, String url, ImageView imageView, int width, int height) { if (!contextIsExist(context)) { return; } - Glide.with(context).asDrawable().load(url) + Glide.with(context) + .asBitmap() + .load(url) .skipMemoryCache(SKIP_MEMORY_CACHE) .apply(RequestOptions.bitmapTransform(sBlurTransformation)) - .into(imageView); + .into(new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + if (width == -1 || height == -1) { + imageView.setImageBitmap(resource); + } else { + Bitmap bitmap = ThumbnailUtils.extractThumbnail(resource, width, height); + imageView.setImageBitmap(bitmap); + } + } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } + }); } /** * 显示模糊的毛玻璃图片 */ public static void displayBlurLive(Context context, String url, ImageView imageView) { + displayBlurLive(context, url, imageView, -1, -1); + } + + public static void displayBlurLive(Context context, String url, ImageView imageView, int width, int height) { if (!contextIsExist(context)) { return; } - Glide.with(context).asDrawable().load(url) + Glide.with(context).asBitmap().load(url) .skipMemoryCache(SKIP_MEMORY_CACHE) - .apply(RequestOptions.bitmapTransform(new BlurTransformation(100))) + .apply(RequestOptions.bitmapTransform(new BlurTransformation(20))) .placeholder(R.mipmap.live_bg) - .into(imageView); + .into(new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + if (width == -1 || height == -1) { + imageView.setImageBitmap(resource); + } else { + Bitmap bitmap = ThumbnailUtils.extractThumbnail(resource, width, height); + imageView.setImageBitmap(bitmap); + } + } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } + }); } private static boolean contextIsExist(Context context) { diff --git a/common/src/main/java/com/yunbao/common/utils/SVGAViewUtils.java b/common/src/main/java/com/yunbao/common/utils/SVGAViewUtils.java new file mode 100644 index 000000000..e28e03ce9 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/utils/SVGAViewUtils.java @@ -0,0 +1,32 @@ +package com.yunbao.common.utils; + +import com.opensource.svgaplayer.SVGACallback; +import com.opensource.svgaplayer.SVGAImageView; + +public class SVGAViewUtils { + public static void playEndClear(SVGAImageView svga){ + svga.setCallback(new SVGACallback() { + @Override + public void onPause() { + + } + + @Override + public void onFinished() { + //动画结束后调用clear释放资源 + svga.clear(); + } + + @Override + public void onRepeat() { + + } + + @Override + public void onStep(int i, double v) { + + } + }); + svga.startAnimation(); + } +} diff --git a/common/src/main/java/com/yunbao/common/utils/VersionUtil.java b/common/src/main/java/com/yunbao/common/utils/VersionUtil.java index 4fd871b6a..6eace2b38 100644 --- a/common/src/main/java/com/yunbao/common/utils/VersionUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/VersionUtil.java @@ -81,7 +81,7 @@ public class VersionUtil { //谷歌更新 } else if (CommonAppConfig.IS_GOOGLE_PLAY == true) { - if (configBean.getGoogle_isup().equals("0")) { + if ("0".equals(configBean.getGoogle_isup())) { DialogUitl.Builder builder = new DialogUitl.Builder(context); builder.setTitle(WordUtil.getString(R.string.version_update)) .setContent(configBean.getUpdateDes()) @@ -158,8 +158,8 @@ public class VersionUtil { } else { ToastUtil.show(R.string.version_download_url_error); } - } else if (CommonAppConfig.IS_GOOGLE_PLAY == true) { - if (configBean.getGoogle_isup().equals("0")) { + } else if (CommonAppConfig.IS_GOOGLE_PLAY) { + if ( "0".equals(configBean.getGoogle_isup())) { Log.e("tagg", "111111"); DialogUitl.Builder builder = new DialogUitl.Builder(context); builder.setTitle(WordUtil.getString(R.string.version_update)) diff --git a/common/src/main/java/com/yunbao/common/views/CustomViewHolder.java b/common/src/main/java/com/yunbao/common/views/CustomViewHolder.java index 3e650f583..b52810567 100644 --- a/common/src/main/java/com/yunbao/common/views/CustomViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/CustomViewHolder.java @@ -8,6 +8,7 @@ import android.widget.ImageView; import com.bumptech.glide.Glide; import com.ms.banner.holder.BannerViewHolder; import com.yunbao.common.bean.BannerBean; +import com.yunbao.common.glide.ImgLoader; public class CustomViewHolder implements BannerViewHolder { @@ -20,7 +21,8 @@ public class CustomViewHolder implements BannerViewHolder { ); imageView.setLayoutParams(params); imageView.setScaleType(ImageView.ScaleType.FIT_XY); - Glide.with(context).load(data.getImageUrl()).into(imageView); + //Glide.with(context).load(data.getImageUrl()).into(imageView); + ImgLoader.display(context,data.getImageUrl(),imageView,600,170); return imageView; } diff --git a/common/src/main/res/layout/dialog_live_new_function.xml b/common/src/main/res/layout/dialog_live_new_function.xml index 251ee5e5a..262c9c0d2 100644 --- a/common/src/main/res/layout/dialog_live_new_function.xml +++ b/common/src/main/res/layout/dialog_live_new_function.xml @@ -263,7 +263,8 @@ android:layout_height="wrap_content" android:layout_marginStart="23dp" android:gravity="center" - android:orientation="vertical"> + android:orientation="vertical" + android:visibility="gone"> Personalized Dress Up Flip Mirroring - Tricky + Trickster MultiplayerPK - LianmaiVoice + Voice Link Start LeaveTemporarily ResumeLive @@ -647,7 +647,7 @@ nearby ten thousand One moment please - Private letter + News Report retry refuse @@ -874,7 +874,10 @@ Limited ride And limited avatar frame has sent you a reward, come and get it! Pay attention to the channel that suits you. What do you say to everyone - LiveConfig + Settings No access to the mystery man\'s personal home page。 The Mystery Man + Notice + Online Service + Hot Ticket diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index ef91d112c..da026408e 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -712,9 +712,9 @@ 購買了靚號 VIP 心願單 - 整蠱 + 娛樂整蠱 多人PK - 連麥語音 + 語音連麥 周星榜 暫時離開 恢復直播 diff --git a/config.gradle b/config.gradle index f9e5da19d..b70c34e06 100644 --- a/config.gradle +++ b/config.gradle @@ -10,9 +10,9 @@ ext { manifestPlaceholders = [ //正式 -// serverHost : "https://napi.yaoulive.com", + serverHost : "https://napi.yaoulive.com", //測試 - serverHost : "https://ceshi.yaoulive.com", +// serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", diff --git a/dependencies.gradle b/dependencies.gradle index 097766920..3a028a4df 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -15,7 +15,7 @@ ext { "glide-transformations": 'jp.wasabeef:glide-transformations:3.1.1',//一个基于Glide的transformation库,拥有裁剪,着色,模糊,滤镜等多种转换效果 "roundedimageview" : 'com.makeramen:roundedimageview:2.3.0', //带圆角，边框的的ImageView "gif-drawable" : 'pl.droidsonroids.gif:android-gif-drawable:1.2.23',//gif库，播放礼物gif用 - "SVGAPlayer" : 'com.github.yyued:SVGAPlayer-Android:2.6.0', //svga播放器 + "SVGAPlayer" : 'com.github.yyued:SVGAPlayer-Android:2.6.1', //svga播放器 "qiniu-sdk" : 'com.qiniu:qiniu-android-sdk:7.2.1',//七牛云存储 // "tencent-cosxml" : 'com.tencent.qcloud:cosxml:5.4.13',//腾讯云存储 // "tencent-wechat-sdk" : 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+',//微信sdk,支付登录分享 @@ -29,6 +29,7 @@ ext { "Luban" : 'top.zibin:Luban:1.1.8',//鲁班压缩图片 "arouter" : 'com.alibaba:arouter-api:1.5.2',//ARouter "arouter-compiler" : 'com.alibaba:arouter-compiler:1.2.2', + "leakcanary" : 'com.squareup.leakcanary:leakcanary-android:2.9.1', "blank-utilcode" : 'com.blankj:utilcode:1.30.0', ] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f55729f8f..9276a5849 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/live/libs/beautysdk-202202241203.aar b/libs/beautysdk-202202241203.aar similarity index 100% rename from live/libs/beautysdk-202202241203.aar rename to libs/beautysdk-202202241203.aar diff --git a/libs/library-release.aar b/libs/library-release.aar new file mode 100644 index 000000000..d4695eb68 Binary files /dev/null and b/libs/library-release.aar differ diff --git a/live/build.gradle b/live/build.gradle index e0206eae9..ecbd2a938 100644 --- a/live/build.gradle +++ b/live/build.gradle @@ -1 +1 @@ -apply plugin: 'com.android.library' apply plugin: 'img-optimizer' apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.android.compileSdkVersion buildToolsVersion rootProject.ext.android.buildToolsVersion aaptOptions.cruncherEnabled = false aaptOptions.useNewCruncher = false packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" pickFirst "lib/armeabi-v7a/libyuvutils.so" pickFirst "lib/armeabi/libyuvtools.so" pickFirst "lib/arm64-v8a/libyuvtools.so" pickFirst "lib/armeabi-v7a/libyuvtools.so" exclude "lib/arm64-v8a/libmmcv_api_handgesture.so" exclude "lib/arm64-v8a/libmmcv_api_express.so" exclude "lib/arm64-v8a/libMediaEncoder.so" exclude "lib/arm64-v8a/libarcore_sdk_c.so" exclude "lib/arm64-v8a/libmediadecoder.so" exclude "lib/arm64-v8a/libMediaMuxer.so" exclude "lib/arm64-v8a/libarcore_sdk_jni.so" exclude "lib/arm64-v8a/libMediaUtils.so" exclude "lib/arm64-v8a/libcosmosffmpeg.so" } defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode rootProject.ext.android.versionCode versionName rootProject.ext.android.versionName manifestPlaceholders = rootProject.ext.manifestPlaceholders ndk { abiFilters "armeabi-v7a", "arm64-v8a" } javaCompileOptions { annotationProcessorOptions { arguments = [AROUTER_MODULE_NAME: project.getName()] } } } aaptOptions { cruncherEnabled = false useNewCruncher = false } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } kotlinOptions { allWarningsAsErrors = true } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } } repositories { flatDir { dirs 'libs', '../libs' } mavenCentral() } dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0' implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) //socket.io implementation('io.socket:socket.io-client:1.0.0') { exclude group: 'org.json', module: 'json' } //common api project(path: ':common') api project(path:':FaceUnity') annotationProcessor rootProject.ext.dependencies["arouter-compiler"] //工具 api rootProject.ext.dependencies["blank-utilcode"] implementation 'com.eightbitlab:blurview:1.6.6' implementation 'com.google.code.gson:gson:2.8.6' implementation "com.getkeepsafe.relinker:relinker:1.4.4" } \ No newline at end of file +apply plugin: 'com.android.library' apply plugin: 'img-optimizer' apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.android.compileSdkVersion buildToolsVersion rootProject.ext.android.buildToolsVersion aaptOptions.cruncherEnabled = false aaptOptions.useNewCruncher = false packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" pickFirst "lib/armeabi-v7a/libyuvutils.so" pickFirst "lib/armeabi/libyuvtools.so" pickFirst "lib/arm64-v8a/libyuvtools.so" pickFirst "lib/armeabi-v7a/libyuvtools.so" exclude "lib/arm64-v8a/libmmcv_api_handgesture.so" exclude "lib/arm64-v8a/libmmcv_api_express.so" exclude "lib/arm64-v8a/libMediaEncoder.so" exclude "lib/arm64-v8a/libarcore_sdk_c.so" exclude "lib/arm64-v8a/libmediadecoder.so" exclude "lib/arm64-v8a/libMediaMuxer.so" exclude "lib/arm64-v8a/libarcore_sdk_jni.so" exclude "lib/arm64-v8a/libMediaUtils.so" exclude "lib/arm64-v8a/libcosmosffmpeg.so" } defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode rootProject.ext.android.versionCode versionName rootProject.ext.android.versionName manifestPlaceholders = rootProject.ext.manifestPlaceholders ndk { abiFilters "armeabi-v7a", "arm64-v8a" } javaCompileOptions { annotationProcessorOptions { arguments = [AROUTER_MODULE_NAME: project.getName()] } } } aaptOptions { cruncherEnabled = false useNewCruncher = false } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } kotlinOptions { allWarningsAsErrors = true } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } } repositories { flatDir { dirs 'libs', '../libs' } mavenCentral() } dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0' implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) implementation (name:'../libs/beautysdk-202202241203',ext:'aar') implementation (name:'../libs/library-release',ext:'aar') //socket.io implementation('io.socket:socket.io-client:1.0.0') { exclude group: 'org.json', module: 'json' } //common api project(path: ':common') // api project(path:':FaceUnity')//新娱美颜 annotationProcessor rootProject.ext.dependencies["arouter-compiler"] //工具 api rootProject.ext.dependencies["blank-utilcode"] implementation 'com.eightbitlab:blurview:1.6.6' implementation 'com.google.code.gson:gson:2.8.6' implementation "com.getkeepsafe.relinker:relinker:1.4.4" } \ No newline at end of file diff --git a/live/src/main/AndroidManifest.xml b/live/src/main/AndroidManifest.xml index 263ecc166..6740a04d5 100644 --- a/live/src/main/AndroidManifest.xml +++ b/live/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ android:allowBackup="true" android:theme="@style/AppTheme"> - + 0) { LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); - LiveRoomCheckLivePresenter.isRoom = true; LiveRoomCheckLivePresenter mCheckLivePresenter = new LiveRoomCheckLivePresenter(mContext, (liveBean1, liveType, liveTypeVal, liveSdk) -> { //主播正在直播 if (liveBean1 == null) { @@ -474,6 +474,7 @@ public class LiveAudienceActivity extends LiveActivity { @Override protected void onDestroy() { super.onDestroy(); + ImgLoader.clearMemory(this); overridePendingTransition(0, 0); Bus.getOff(this); L.e("LiveAudienceActivity-------onDestroy------->"); diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java index 6d86ed44d..47696dae4 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java @@ -1,5 +1,16 @@ package com.yunbao.live.activity; +import static com.blankj.utilcode.util.SnackbarUtils.dismiss; +import static com.tencent.trtc.TRTCCloudDef.TRTC_VIDEO_MIRROR_TYPE_DISABLE; +import static com.tencent.trtc.TRTCCloudDef.TRTC_VIDEO_MIRROR_TYPE_ENABLE; +import static com.yunbao.common.Constants.SOCKET_LIVE_DRPK; +import static com.yunbao.live.views.AbsRyLivePushViewHolder.mPreView; +import static com.yunbao.live.views.LivePushRyViewHolder.dr_pk_view; +import static com.yunbao.live.views.LivePushRyViewHolder.rtcRoom; +import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_dr_pk_nub; +import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_start_dr_pk; +import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_start_dr_pk_view; + import android.app.Dialog; import android.content.Context; import android.content.Intent; @@ -47,13 +58,10 @@ import com.yunbao.live.bean.LiveKsyConfigBean; import com.yunbao.live.bean.LiveReceiveGiftBean; import com.yunbao.live.bean.WishlistModel; import com.yunbao.live.dialog.LiveBeautyDialogFragment; -import com.yunbao.live.dialog.LiveFaceUnityDialogFragment; -import com.yunbao.live.dialog.LiveFunctionDialogFragment; import com.yunbao.live.dialog.LiveLinkMicListDialogFragment; import com.yunbao.live.dialog.LiveMicUserDialogFragment; import com.yunbao.live.dialog.LiveNewFunctionDialogFragment; import com.yunbao.live.dialog.LiveNewWishListDialogFragment; -import com.yunbao.live.dialog.LiveWishListDialogFragment; import com.yunbao.live.event.LinkMicTxMixStreamEvent; import com.yunbao.live.http.LiveHttpConsts; import com.yunbao.live.http.LiveHttpUtil; @@ -67,7 +75,6 @@ import com.yunbao.live.presenter.LiveRyLinkMicPkPresenter; import com.yunbao.live.socket.SocketRyChatUtil; import com.yunbao.live.socket.SocketRyClient; import com.yunbao.live.socket.SocketSendBean; -import com.yunbao.live.views.AbsRyLivePushViewHolder; import com.yunbao.live.views.LiveEndViewHolder; import com.yunbao.live.views.LiveMusicViewHolder; import com.yunbao.live.views.LiveNewReadyRyViewHolder; @@ -91,17 +98,6 @@ import io.rong.imlib.model.Message; import io.rong.message.TextMessage; import pl.droidsonroids.gif.GifImageView; -import static com.blankj.utilcode.util.SnackbarUtils.dismiss; -import static com.tencent.trtc.TRTCCloudDef.TRTC_VIDEO_MIRROR_TYPE_DISABLE; -import static com.tencent.trtc.TRTCCloudDef.TRTC_VIDEO_MIRROR_TYPE_ENABLE; -import static com.yunbao.common.Constants.SOCKET_LIVE_DRPK; -import static com.yunbao.live.views.AbsRyLivePushViewHolder.mPreView; -import static com.yunbao.live.views.LivePushRyViewHolder.dr_pk_view; -import static com.yunbao.live.views.LivePushRyViewHolder.rtcRoom; -import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_dr_pk_nub; -import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_start_dr_pk; -import static com.yunbao.live.views.LiveRyAnchorViewHolder.btn_start_dr_pk_view; - /** @@ -474,12 +470,12 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl if (mLiveReadyViewHolder != null) { mLiveReadyViewHolder.hide(); } - if(mLiveRoomViewHolder!=null){ + /* if(mLiveRoomViewHolder!=null){ mLiveRoomViewHolder.changeFaceUnityView(); - } - /* LiveBeautyDialogFragment fragment = new LiveBeautyDialogFragment(); + }*/ + LiveBeautyDialogFragment fragment = new LiveBeautyDialogFragment(); fragment.setiBeautyModule(BeautyManager.iBeautyModule, BeautyManager.iLookupModule, BeautyManager.iBeautyBodyModule); - fragment.show(getSupportFragmentManager(), "LiveBeautyDialogFragment");*/ + fragment.show(getSupportFragmentManager(), "LiveBeautyDialogFragment"); } /** diff --git a/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java b/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java index a968068da..98de19317 100644 --- a/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java @@ -1,5 +1,9 @@ package com.yunbao.live.activity; +import static com.yunbao.common.CommonAppContext.logger; +import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics; +import static com.yunbao.common.utils.RouteUtil.PATH_COIN; + import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; @@ -36,8 +40,11 @@ import com.opensource.svgaplayer.SVGAVideoEntity; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; import com.yunbao.common.activity.AbsActivity; +import com.yunbao.common.bean.IMLoginModel; +import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.L; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; @@ -45,10 +52,6 @@ import com.yunbao.live.R; import java.net.MalformedURLException; import java.net.URL; -import static com.yunbao.common.CommonAppContext.logger; -import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics; -import static com.yunbao.common.utils.RouteUtil.PATH_COIN; - public class ZhuangBanActivity extends AbsActivity { private ProgressBar mProgressBar; @@ -81,9 +84,9 @@ public class ZhuangBanActivity extends AbsActivity { title.setVisibility(View.GONE); } if (getIntent().hasExtra("title")) { - if (TextUtils.isEmpty(titleString)){ + if (TextUtils.isEmpty(titleString)) { title.setVisibility(View.GONE); - }else { + } else { if (TextUtils.equals(titleString, "blank")) { title.setVisibility(View.GONE); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) rootView.getLayoutParams(); @@ -113,7 +116,13 @@ public class ZhuangBanActivity extends AbsActivity { copy(content); } } else { - view.loadUrl(url); + mWebView.post(new Runnable() { + @Override + public void run() { + view.loadUrl(url); + } + }); + } return true; } @@ -184,7 +193,7 @@ public class ZhuangBanActivity extends AbsActivity { SVGADrawable drawable = new SVGADrawable(videoItem); svga.setImageDrawable(drawable); svga.setLoops(1); - svga.startAnimation(); + SVGAViewUtils.playEndClear(svga); } @Override @@ -272,6 +281,23 @@ public class ZhuangBanActivity extends AbsActivity { mContext.startActivity(intent); } + + /** + * 设置超皇字体颜色 + * + * @param startColor 渐变色 + * @param endColor 渐变色 + * @param contentColor 内容颜色 + */ + @JavascriptInterface + public void androidSetColor(String startColor, String endColor, String contentColor) { + IMLoginModel model = IMLoginManager.get(mContext).getUserInfo(); + model.setStartColor("#"+startColor) + .setEndColor("#"+endColor) + .setContentColor("#"+contentColor); + IMLoginManager.get(mContext).upDataUserInfo(model); + } + } // //js调用原生 diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveReadyClassAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveReadyClassAdapter.java index 177f2d7f8..8dc85a545 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveReadyClassAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveReadyClassAdapter.java @@ -76,12 +76,15 @@ public class LiveReadyClassAdapter extends RecyclerView.Adapter { - Object tag = view.getTag(); - if (tag != null && mOnItemClickListener != null) { - mOnItemClickListener.onItemClick((LiveClassBean) tag, 0); - } - }); + itemView.setOnClickListener(view -> click()); + mRadioButton.setOnClickListener(v -> click()); + } + + void click() { + Object tag = itemView.getTag(); + if (tag != null && mOnItemClickListener != null) { + mOnItemClickListener.onItemClick((LiveClassBean) tag, 0); + } } void setData(LiveClassBean bean) { diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java index afd597792..aa12c832b 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java @@ -1,36 +1,35 @@ package com.yunbao.live.adapter; +import static android.text.TextUtils.isEmpty; + import android.content.Context; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; + import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; -import com.yunbao.live.R; -import com.yunbao.common.bean.LevelBean; -import com.yunbao.live.bean.LiveUserGiftBean; import com.yunbao.common.bean.UserBean; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.interfaces.OnItemClickListener; +import com.yunbao.common.utils.SVGAViewUtils; +import com.yunbao.live.R; +import com.yunbao.live.bean.LiveUserGiftBean; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import static android.text.TextUtils.isEmpty; - /** * Created by cxf on 2018/10/10. */ @@ -103,7 +102,7 @@ public class LiveUserAdapter extends RecyclerView.Adapter { public Vh(View itemView) { super(itemView); mWrap = (ImageView) itemView.findViewById(R.id.wrap); - gift_svga = (SVGAImageView)itemView.findViewById(R.id.gift_svga); + gift_svga = (SVGAImageView) itemView.findViewById(R.id.gift_svga); mAvatar = (ImageView) itemView.findViewById(R.id.avatar); mIcon = (ImageView) itemView.findViewById(R.id.icon); mGuardIcon = (ImageView) itemView.findViewById(R.id.guard_icon); @@ -114,37 +113,12 @@ public class LiveUserAdapter extends RecyclerView.Adapter { itemView.setTag(position); if (payload == null) { - ImgLoader.displayAvatar(mContext, userBean.getAvatar(), mAvatar); - LevelBean levelBean = CommonAppConfig.getInstance().getLevel(userBean.getLevel()); -// if (levelBean != null) { -// ImgLoader.display(mContext, levelBean.getThumbIcon(), mIcon); -// } + ImgLoader.displayAvatar(mContext, userBean.getAvatar(), mAvatar,64,64); + // ImageLoadUtils.loadUrl(userBean.getAvatar(),32,32,mAvatar); } - int guardType = userBean.getGuardType(); -// if (guardType == Constants.GUARD_TYPE_NONE) { -// if (mIcon.getVisibility() != View.VISIBLE) { -// mIcon.setVisibility(View.VISIBLE); -// } -// if (mGuardIcon.getVisibility() == View.VISIBLE) { -// mGuardIcon.setVisibility(View.INVISIBLE); -// } -// } else { -// if (mIcon.getVisibility() == View.VISIBLE) { -// mIcon.setVisibility(View.INVISIBLE); -// } -// if (mGuardIcon.getVisibility() != View.VISIBLE) { -// mGuardIcon.setVisibility(View.VISIBLE); -// } -// if (guardType == Constants.GUARD_TYPE_DAY) { -// mGuardIcon.setImageDrawable(mGuardDrawable0); -// }else if (guardType == Constants.GUARD_TYPE_MONTH) { -// mGuardIcon.setImageDrawable(mGuardDrawable1); -// } else if (guardType == Constants.GUARD_TYPE_YEAR) { -// mGuardIcon.setImageDrawable(mGuardDrawable2); -// } -// } - if(userBean.getDress()!=null){ - if(userBean.getDress().getAvatar_frame().contains("svga")) { + + if (userBean.getDress() != null) { + if (userBean.getDress().getAvatar_frame().contains("svga")) { try { new SVGAParser(mContext).parse(new URL(userBean.getDress().getAvatar_frame()), new SVGAParser.ParseCompletion() { @@ -152,7 +126,7 @@ public class LiveUserAdapter extends RecyclerView.Adapter { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); gift_svga.setImageDrawable(drawable); - gift_svga.startAnimation(); + SVGAViewUtils.playEndClear(gift_svga); } @Override @@ -162,25 +136,10 @@ public class LiveUserAdapter extends RecyclerView.Adapter { } catch (MalformedURLException e) { e.printStackTrace(); } - }else{ - ImgLoader.display(mContext,userBean.getDress().getAvatar_frame(), gift_svga); + } else { + ImgLoader.display(mContext, userBean.getDress().getAvatar_frame(), gift_svga); } } -// if (position == 0) { -// if (userBean.hasContribution()) { -// mWrap.setImageResource(R.mipmap.icon_live_user_list_1); -// } -// } else if (position == 1) { -// if (userBean.hasContribution()) { -// mWrap.setImageResource(R.mipmap.icon_live_user_list_2); -// } -// } else if (position == 2) { -// if (userBean.hasContribution()) { -// mWrap.setImageResource(R.mipmap.icon_live_user_list_3); -// } -// } else { -// mWrap.setImageDrawable(null); -// } } } @@ -216,49 +175,6 @@ public class LiveUserAdapter extends RecyclerView.Adapter { } } -// public void insertItem(LiveUserGiftBean userBean) { -// if (userBean == null) { -// return; -// } -// int position = findItemPosition(userBean.getId()); -// if (position >= 0) { -// return; -// } -// int size = mList.size(); -// mList.add(userBean); -// notifyDataSetChanged(); -//// notifyItemInserted(size); -// } -// -// public void insertList(List list) { -// for (int i = 0; i < list.size(); i++) { -// } -// if (mList != null && list != null && list.size() > 0) { -// int position = mList.size(); -// mList.addAll(list); -// notifyItemRangeInserted(position, mList.size()); -// } -// } - -// /** -// * 守护信息发生变化 -// */ -// public void onGuardChanged(String uid, int guardType) { -// if (!isEmpty(uid)) { -// for (int i = 0, size = mList.size(); i < size; i++) { -// LiveUserGiftBean bean = mList.get(i); -// if (uid.equals(bean.getId())) { -// if (bean.getGuardType() != guardType) { -// Log.d("onGuardChanged",""+bean.getGuardType()); -// bean.setGuardType(guardType); -// notifyItemChanged(i, Constants.PAYLOAD); -// } -// break; -// } -// } -// } -// } - public void clear() { if (mList != null) { mList.clear(); diff --git a/live/src/main/java/com/yunbao/live/adapter/UserMicInfoAdapter.java b/live/src/main/java/com/yunbao/live/adapter/UserMicInfoAdapter.java index 3b515a346..f01e0bab5 100644 --- a/live/src/main/java/com/yunbao/live/adapter/UserMicInfoAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/UserMicInfoAdapter.java @@ -21,6 +21,7 @@ import com.yunbao.common.bean.LevelBean; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.utils.CommonIconUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.bean.MicUserBean; @@ -96,7 +97,7 @@ public class UserMicInfoAdapter extends RefreshAdapter { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); gift_svga.setImageDrawable(drawable); - gift_svga.startAnimation(); + SVGAViewUtils.playEndClear(gift_svga); } @Override diff --git a/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java b/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java index 6e40da6d6..3129f972e 100644 --- a/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java @@ -30,6 +30,7 @@ import com.yunbao.common.bean.UserBean; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.utils.CommonIconUtil; import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ToastUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; @@ -261,7 +262,7 @@ public class UserMoreInfoAdapter extends RefreshAdapter { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); gift_svga.setImageDrawable(drawable); - gift_svga.startAnimation(); + SVGAViewUtils.playEndClear(gift_svga); } @Override diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveFaceUnityDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveFaceUnityDialogFragment.java index 317f76535..285943a0a 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveFaceUnityDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveFaceUnityDialogFragment.java @@ -12,14 +12,16 @@ import android.view.WindowManager; import androidx.annotation.Nullable; import com.yunbao.common.dialog.AbsDialogFragment; -import com.yunbao.faceunity.FaceManager; -import com.yunbao.faceunity.ui.FaceUnityView; import com.yunbao.live.R; +/** + * 新娱美颜SDK，暂时不用，不要删除 + */ public class LiveFaceUnityDialogFragment extends AbsDialogFragment { private Context mContext; - private FaceUnityView faceView; - private FaceManager manager; + // private FaceUnityView faceView; + // private FaceManager manager; + private View mRootView; public LiveFaceUnityDialogFragment(Context mContext) { this.mContext = mContext; @@ -32,8 +34,9 @@ public class LiveFaceUnityDialogFragment extends AbsDialogFragment { @Override protected View getLayoutView() { - faceView = new FaceUnityView(mContext); - return faceView; + // faceView = new FaceUnityView(mContext); + // return faceView; + return null; } @Override @@ -51,7 +54,7 @@ public class LiveFaceUnityDialogFragment extends AbsDialogFragment { WindowManager.LayoutParams params = window.getAttributes(); params.width = ActionBar.LayoutParams.MATCH_PARENT; - params.height = ActionBar.LayoutParams.WRAP_CONTENT; + params.height = ActionBar.LayoutParams.WRAP_CONTENT; params.gravity = Gravity.BOTTOM; window.setAttributes(params); @@ -60,11 +63,23 @@ public class LiveFaceUnityDialogFragment extends AbsDialogFragment { @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); + // manager.setFaceUnityView(faceView); } - public void setManager(FaceManager manager) { + @Override + public void onDismiss(DialogInterface dialog) { + super.onDismiss(dialog); + if(mRootView!=null) { + mRootView.setVisibility(View.VISIBLE); + } + } + + /* public void setManager(FaceManager manager) { this.manager = manager; + }*/ + + + public void setDismissShowUi(View mRootView) { + this.mRootView=mRootView; } - - } diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiveHotDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiveHotDialogFragment.java index e9f556b54..b82f1e3c8 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiveHotDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiveHotDialogFragment.java @@ -31,6 +31,7 @@ import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.utils.CommonIconUtil; import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.bean.HotBean; @@ -218,7 +219,7 @@ public class LiveGiveHotDialogFragment extends AbsDialogFragment { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); viewHolder.gift_svga.setImageDrawable(drawable); - viewHolder.gift_svga.startAnimation(); + SVGAViewUtils.playEndClear(viewHolder.gift_svga); } @Override diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java index 205dccc80..b4dfb8738 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java @@ -269,7 +269,6 @@ public class LiveHDDialogFragment extends AbsDialogFragment { if (code == 0 && info.length > 0) { LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); if (mCheckLivePresenter == null) { - LiveRoomCheckLivePresenter.isRoom = false; mCheckLivePresenter = new LiveRoomCheckLivePresenter(mContext, new LiveRoomCheckLivePresenter.ActionListener() { @Override public void onLiveRoomChanged(LiveBean liveBean, int liveType, int liveTypeVal, int liveSdk) { diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java index 94d43c393..1ac176c7a 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java @@ -1,5 +1,7 @@ package com.yunbao.live.dialog; +import static android.content.Context.INPUT_METHOD_SERVICE; + import android.app.Activity; import android.graphics.Color; import android.graphics.drawable.Drawable; @@ -37,12 +39,12 @@ import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; +import com.yunbao.live.activity.LiveAnchorActivity; +import com.yunbao.live.activity.LiveRyAnchorActivity; import java.util.ArrayList; import java.util.List; -import static android.content.Context.INPUT_METHOD_SERVICE; - /** * Created by cxf on 2017/8/21. * 直播间发言框 @@ -97,6 +99,7 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); + imm = (InputMethodManager) mContext.getSystemService(INPUT_METHOD_SERVICE); mInput = (EditText) mRootView.findViewById(R.id.input); radioHornType = mRootView.findViewById(R.id.radio_horn_type); @@ -104,6 +107,11 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O RadioButton radioButton = mRootView.findViewById(id); radioHornTypes.add(radioButton); } + if (mContext instanceof LiveRyAnchorActivity) { + findViewById(R.id.btn_2).setVisibility(View.GONE); + } else { + findViewById(R.id.btn_2).setVisibility(View.VISIBLE); + } mInput.setFocusable(true); mInput.setFocusableInTouchMode(true); mInput.requestFocus(); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java index 864dec6fe..48b056bcc 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java @@ -36,6 +36,7 @@ import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.utils.CommonIconUtil; import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.RouteUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; @@ -368,7 +369,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); gift_svga.setImageDrawable(drawable); - gift_svga.startAnimation(); + SVGAViewUtils.playEndClear(gift_svga); } @Override diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java index 71090e1d6..023586bed 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java @@ -39,6 +39,7 @@ import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.GifCacheUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ScreenDimenUtil; import com.yunbao.live.R; import com.yunbao.live.bean.LiveChatBean; @@ -310,7 +311,7 @@ public class LiveEnterRoomAnimPresenter { SVGARect rect = svgaVideoEntity.getVideoSize(); enter_room_svg_small.setVideoItem(svgaVideoEntity); enter_room_svg_small.setLoops(1); - enter_room_svg_small.startAnimation(); + SVGAViewUtils.playEndClear(enter_room_svg_small); } } else { if (mSVGImageView != null) { @@ -318,7 +319,6 @@ public class LiveEnterRoomAnimPresenter { SVGARect rect = svgaVideoEntity.getVideoSize(); mSVGImageView.setVideoItem(svgaVideoEntity); mSVGImageView.setLoops(1); - mSVGImageView.startAnimation(); mSVGImageView.setCallback(new SVGACallback() { @Override public void onPause() { @@ -343,6 +343,7 @@ public class LiveEnterRoomAnimPresenter { } }); + mSVGImageView.startAnimation(); } } mIsAnimating = false; diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java index cd0f8f6e1..cdc1577d8 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java @@ -592,6 +592,7 @@ public class LiveGiftAnimPresenter { if (mHandler != null) { mHandler.sendEmptyMessageDelayed(WHAT_GIF, diffTime); } + mSVGAImageView.clear(); } @Override @@ -614,6 +615,7 @@ public class LiveGiftAnimPresenter { if (diffTime < 0) { diffTime = 0; } + mSVGAImageViewFront.clear(); // if (mHandler != null) { // mHandler.sendEmptyMessageDelayed(WHAT_GIF_All_SERVER, diffTime); // } @@ -1224,7 +1226,6 @@ public class LiveGiftAnimPresenter { resizeSvgaImageView(rect.getWidth(), rect.getHeight()); mSvgaPlayTime = System.currentTimeMillis(); mSVGAImageView.setVideoItem(svgaVideoEntity); - mSVGAImageView.startAnimation(); mSVGAImageView.setCallback(new SVGACallback() { @Override public void onPause() { @@ -1254,6 +1255,7 @@ public class LiveGiftAnimPresenter { } }); + mSVGAImageView.startAnimation(); } } diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveRoomCheckLivePresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveRoomCheckLivePresenter.java index 5531a0158..e90bd6bc9 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveRoomCheckLivePresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveRoomCheckLivePresenter.java @@ -106,27 +106,23 @@ public class LiveRoomCheckLivePresenter { * 前往密码房间 */ private void forwardPwdRoom() { - if (!isRoom) { - DialogUitl.showSimpleInputDialog(mContext, WordUtil.getString(R.string.live_input_password), DialogUitl.INPUT_TYPE_NUMBER_PASSWORD, new DialogUitl.SimpleCallback() { - @Override - public void onConfirmClick(Dialog dialog, String content) { - if (TextUtils.isEmpty(content)) { - ToastUtil.show(WordUtil.getString(R.string.live_input_password)); - return; - } - String password = MD5Util.getMD5(content); - if (mLiveTypeMsg.equalsIgnoreCase(password)) { - dialog.dismiss(); - enterLiveRoom(); - } else { - ToastUtil.show(WordUtil.getString(R.string.live_password_error)); - } + DialogUitl.showSimpleInputDialog(mContext, WordUtil.getString(R.string.live_input_password), DialogUitl.INPUT_TYPE_NUMBER_PASSWORD, new DialogUitl.SimpleCallback() { + @Override + public void onConfirmClick(Dialog dialog, String content) { + if (TextUtils.isEmpty(content)) { + ToastUtil.show(WordUtil.getString(R.string.live_input_password)); + return; } - }); - } else { - enterLiveRoom(); - isRoom = false; - } + String password = MD5Util.getMD5(content); + if (mLiveTypeMsg.equalsIgnoreCase(password)) { + dialog.dismiss(); + enterLiveRoom(); + } else { + ToastUtil.show(WordUtil.getString(R.string.live_password_error)); + } + } + }); + } diff --git a/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java b/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java index 4ff1b43be..e00a38b16 100644 --- a/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java +++ b/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java @@ -159,8 +159,6 @@ public class LiveTextRender { } - - if (bean.isManager()) {//直播间管理员图标 Drawable drawable = ContextCompat.getDrawable(CommonAppContext.sInstance, R.mipmap.icon_live_chat_m); if (drawable != null) { @@ -336,15 +334,16 @@ public class LiveTextRender { } builder.append(name); //超皇设置渐变色展示昵称 - if (TextUtils.equals("7",bean.getNobleId())){ + if (TextUtils.equals("7", bean.getNobleId()) && !TextUtils.isEmpty(bean.getStartColor())) { + builder.setSpan(new LinearGradientFontSpan(Color.parseColor(bean.getStartColor()), Color.parseColor(bean.getEndColor())), length, length + name.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - }else { + } else { builder.setSpan(new ForegroundColorSpan(color), length, length + name.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } int lengthContent = builder.length(); builder.append(bean.getContent()); //超皇设置渐变色展示昵称 - if (TextUtils.equals("7",bean.getNobleId())){ + if (TextUtils.equals("7", bean.getNobleId()) && !TextUtils.isEmpty(bean.getContentColor())) { builder.setSpan(new ForegroundColorSpan(Color.parseColor(bean.getContentColor())), lengthContent, lengthContent + bean.getContent().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } if (bean.getType() == LiveChatBean.LIGHT) { diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java index c7c87f475..a157b1f6f 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java @@ -20,12 +20,14 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.ViewFlipper; +import com.opensource.svgaplayer.SVGACallback; import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; +import com.yunbao.common.bean.MsgModel; import com.yunbao.common.bean.NewPeopleInfo; import com.yunbao.common.event.MessageIMEvent; import com.yunbao.common.glide.ImgLoader; @@ -35,6 +37,7 @@ import com.yunbao.common.http.HttpClient; import com.yunbao.common.manager.imrongcloud.MessageIMManager; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; @@ -123,7 +126,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); svga_new_user_gif.setImageDrawable(drawable); - svga_new_user_gif.startAnimation(); + SVGAViewUtils.playEndClear(svga_new_user_gif); } @Override @@ -142,7 +145,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { SVGADrawable drawable = new SVGADrawable(videoItem); svga_new_user_double.setImageDrawable(drawable); svga_new_user_double.setBackgroundResource(R.mipmap.black_bg); - svga_new_user_double.startAnimation(); + SVGAViewUtils.playEndClear(svga_new_user_double); } @Override @@ -159,7 +162,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); svga_new_user_follow.setImageDrawable(drawable); - svga_new_user_follow.startAnimation(); + SVGAViewUtils.playEndClear(svga_new_user_follow); } @Override diff --git a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java index 74fc4e174..1d9686bde 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java @@ -33,8 +33,8 @@ import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.AbsViewHolder; -import com.yunbao.faceunity.FaceManager; import com.yunbao.live.R; +import com.yunbao.live.activity.Beauty360Activity3; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveRyAnchorActivity; import com.yunbao.live.bean.LiveRoomTypeBean; @@ -53,7 +53,7 @@ import cn.rongcloud.rtc.api.stream.RCRTCCameraOutputStream; public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnClickListener { - private ConstraintLayout mAvatar; + private ConstraintLayout mAvatar,mRootView; private TextView mCoverText; private EditText mEditTitle; private ProcessImageUtil mImageUtil; @@ -70,7 +70,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl private boolean mOpenLocation = true; private int mLiveSdk; private LiveClassBean classBean; - private FaceManager manager; + // private FaceManager manager; private TextView faceTextView;//提示人脸未检测到的TextView public LiveNewReadyRyViewHolder(Context context, ViewGroup parentView, int liveSdk) { @@ -91,8 +91,8 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl @Override public void init() { - ConstraintLayout traceroute_rootview = (ConstraintLayout) findViewById(R.id.traceroute_rootview); - traceroute_rootview.setOnClickListener(new View.OnClickListener() { + mRootView = (ConstraintLayout) findViewById(R.id.traceroute_rootview); + mRootView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { InputMethodManager imm = (InputMethodManager) @@ -190,7 +190,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl } } }; - manager = new FaceManager(); + /* manager = new FaceManager(); manager.setFaceStatusChanged(new FaceManager.FaceStatusChanged() { final Handler handler = new Handler(Looper.getMainLooper()); @@ -204,9 +204,10 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl } }); } - }); - manager.initFURender(mContext); - manager.drawRongFrame(mContext); + });*/ + //新美颜 + //manager.initFURender(mContext); + //manager.drawRongFrame(mContext); } @@ -226,7 +227,8 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl } else if (i == R.id.btn_live_class) { chooseLiveClass(); } else if (i == R.id.btn_beauty) { - setFaceUnity(); + beauty();//momo美颜 + //setFaceUnity(); //新娱美颜 } else if (i == R.id.btn_wishlist) { //点击心愿单 openWishListWindow(); @@ -243,12 +245,16 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl } } + /** + * 新娱美颜 + */ public void setFaceUnity() { LiveFaceUnityDialogFragment fragment = new LiveFaceUnityDialogFragment(mContext); - fragment.setManager(manager); - + // fragment.setManager(manager); + fragment.setDismissShowUi(mRootView); if (mContext instanceof LiveRyAnchorActivity) { fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "FaceUnity"); + mRootView.setVisibility(View.INVISIBLE); } } @@ -358,8 +364,8 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl */ private void beauty() { ((LiveRyAnchorActivity) mContext).beauty(); -// Intent intent = new Intent(mContext, Beauty360Activity3.class); -// mContext.startActivity(intent); + // Intent intent = new Intent(mContext, Beauty360Activity3.class); + // mContext.startActivity(intent); } diff --git a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java index cf871366e..e08ec34e4 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java @@ -532,7 +532,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX //美颜 new Handler(Looper.getMainLooper()).post(new Runnable() { public void run() { -/* //旧美颜不需要了 + //旧美颜不需要了 RCRTCEngine.getInstance().getDefaultVideoStream().setVideoFrameListener(new IRCRTCVideoOutputFrameListener() { @Override public RCRTCVideoFrame processVideoFrame(RCRTCVideoFrame rtcVideoFrame) { @@ -541,7 +541,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX return rtcVideoFrame; } }); -*/ + } }); } diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 39509a455..f97fc0191 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -74,6 +74,7 @@ import com.yunbao.common.utils.DeviceUtils; import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.RouteUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ScreenDimenUtil; import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.StringUtil; @@ -83,7 +84,6 @@ import com.yunbao.common.views.AbsViewHolder; import com.yunbao.common.views.weight.FullServiceNotificationView; import com.yunbao.common.views.weight.NobleNoticeView; import com.yunbao.common.views.weight.ViewClicksAntiShake; -import com.yunbao.faceunity.FaceManager; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveAnchorActivity; @@ -294,7 +294,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private RoundedImageView msgUserIcon; //悬浮窗icon private FullServiceNotificationView fullScreen;//全副喇叭 private NobleNoticeView noble;//全副喇叭 - private FaceManager manager; + //private FaceManager manager; public LiveRoomViewHolder(boolean isRys, int forActivity, Context context, ViewGroup parentView, GifImageView gifImageView, SVGAImageView svgaImageView, ViewGroup liveGiftPrizePoolContainer, WindowManager windowManager) { super(context, parentView); @@ -369,7 +369,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); mSVGAImageView.setImageDrawable(drawable); - mSVGAImageView.startAnimation(); + SVGAViewUtils.playEndClear(mSVGAImageView); } @Override @@ -2607,7 +2607,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis * 启动美颜SDK */ public void startFace() { - manager = new FaceManager(); + /* manager = new FaceManager(); manager.setFaceStatusChanged(new FaceManager.FaceStatusChanged() { @Override public void onFaceChanged(int num) { @@ -2615,7 +2615,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } }); manager.initFURender(mContext); - manager.drawRongFrame(mContext); + manager.drawRongFrame(mContext);*/ } /** @@ -2624,7 +2624,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public void changeFaceUnityView() { // faceUnityView.setVisibility(faceUnityView.getVisibility() == View.GONE ? View.VISIBLE : View.GONE); LiveFaceUnityDialogFragment fragment = new LiveFaceUnityDialogFragment(mContext); - fragment.setManager(manager); + // fragment.setManager(manager); fragment.show(((LiveActivity) mContext).getSupportFragmentManager(), "faceUi"); } diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index a4f57025c..f4c833e52 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -240,7 +240,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRyLinkMicPkPresenter = new LiveRyLinkMicPkPresenter(mContext, mLivePlayViewHolder, false, null); //直播间背景 - ImgLoader.displayBlurLive(mContext, mLiveBean.getAvatar(), liveBack); + ImgLoader.displayBlurLive(mContext, mLiveBean.getAvatar(), liveBack,400,600); + //ImageLoadUtils.loadUrlToBlur(mContext,mLiveBean.getAvatar(),400,600,liveBack); mask.setVisibility(View.VISIBLE); mLivePlayViewHolder.setCover(data.getThumb()); mLivePlayViewHolder.play(data.getPull()); diff --git a/live/src/main/res/drawable/bg_xyd.png b/live/src/main/res/drawable/bg_xyd.png index 62f8aef9c..0143a5dcd 100644 Binary files a/live/src/main/res/drawable/bg_xyd.png and b/live/src/main/res/drawable/bg_xyd.png differ diff --git a/live/src/main/res/drawable/bg_xyd_add_item.png b/live/src/main/res/drawable/bg_xyd_add_item.png index d1573cd21..4f8ed8d04 100644 Binary files a/live/src/main/res/drawable/bg_xyd_add_item.png and b/live/src/main/res/drawable/bg_xyd_add_item.png differ diff --git a/live/src/main/res/drawable/bg_xyd_empty.png b/live/src/main/res/drawable/bg_xyd_empty.png index 79af1482b..42d398b05 100644 Binary files a/live/src/main/res/drawable/bg_xyd_empty.png and b/live/src/main/res/drawable/bg_xyd_empty.png differ diff --git a/live/src/main/res/drawable/guardian_img_bg.png b/live/src/main/res/drawable/guardian_img_bg.png index 2a6bc02e6..42e652836 100644 Binary files a/live/src/main/res/drawable/guardian_img_bg.png and b/live/src/main/res/drawable/guardian_img_bg.png differ diff --git a/live/src/main/res/drawable/guardian_img_two.png b/live/src/main/res/drawable/guardian_img_two.png index e596bc84c..1088b9436 100644 Binary files a/live/src/main/res/drawable/guardian_img_two.png and b/live/src/main/res/drawable/guardian_img_two.png differ diff --git a/live/src/main/res/drawable/guardian_img_wings.png b/live/src/main/res/drawable/guardian_img_wings.png index 25aaed820..c483190a9 100644 Binary files a/live/src/main/res/drawable/guardian_img_wings.png and b/live/src/main/res/drawable/guardian_img_wings.png differ diff --git a/live/src/main/res/drawable/guardian_img_wings_p.png b/live/src/main/res/drawable/guardian_img_wings_p.png index ba82895f1..a39bf57d2 100644 Binary files a/live/src/main/res/drawable/guardian_img_wings_p.png and b/live/src/main/res/drawable/guardian_img_wings_p.png differ diff --git a/live/src/main/res/drawable/img_rank_empty.png b/live/src/main/res/drawable/img_rank_empty.png index c7798341d..1c0e70ca8 100644 Binary files a/live/src/main/res/drawable/img_rank_empty.png and b/live/src/main/res/drawable/img_rank_empty.png differ diff --git a/live/src/main/res/layout/dialog_new_live_room_type.xml b/live/src/main/res/layout/dialog_new_live_room_type.xml index bc30f34c1..816e30a83 100644 --- a/live/src/main/res/layout/dialog_new_live_room_type.xml +++ b/live/src/main/res/layout/dialog_new_live_room_type.xml @@ -35,12 +35,12 @@ android:id="@+id/public_room" android:layout_width="166dp" android:layout_height="162dp" + android:layout_marginStart="24dp" android:layout_marginTop="54dp" - android:layout_marginEnd="24dp" android:layout_marginBottom="33dp" android:background="@drawable/bg_new_live_room_type_select" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/private_room" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> + android:layout_height="match_parent" + android:scaleType="centerCrop" /> \ No newline at end of file diff --git a/live/src/main/res/layout/view_new_live_ready.xml b/live/src/main/res/layout/view_new_live_ready.xml index 0ec5b7b4d..ad710bde1 100644 --- a/live/src/main/res/layout/view_new_live_ready.xml +++ b/live/src/main/res/layout/view_new_live_ready.xml @@ -257,7 +257,7 @@ android:textColor="#FFFFFF" android:visibility="gone" android:textSize="16sp" - android:text="@string/fu_base_is_tracking_text" + android:text="" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml index 86d7b90b0..5bbc2d6cf 100644 --- a/live/src/main/res/values-en/strings.xml +++ b/live/src/main/res/values-en/strings.xml @@ -11,10 +11,10 @@ Guard Fans News - SelectType - Public - PasswordRoom - Everyone can watch - Those who have a room password can watch + Select room type + Public Rooms + Password Rooms + Available for all + Only those who have the room code can watch Submit \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 0bc4161f2..59de84a13 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -65,12 +65,14 @@ repositories { dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation fileTree(include: ['*.jar'], dir: 'libs') + compileOnly files('../libs/beautysdk-202202241203.aar') + compileOnly files('../libs/library-release.aar') //直播 api project(':live') //短视频 api project(':video') api project(':common') - api project(':FaceUnity') + //api project(':FaceUnity')//新娱美颜 implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'com.google.android.material:material:1.4.0' annotationProcessor rootProject.ext.dependencies["arouter-compiler"] diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java index c9030463d..bad5d790b 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java @@ -141,7 +141,7 @@ import kotlin.Unit; @Route(path = RouteUtil.PATH_MAIN) public class MainActivity extends AbsActivity implements MainAppBarLayoutListener { - public static RelativeLayout rt_main_tab; + public RelativeLayout rt_main_tab; private ViewGroup mRootView; private TabButtonGroup mTabButtonGroup; private ViewPager mViewPager; @@ -320,7 +320,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene RongIMClient.init(this, RongcloudIMManager.RONG_IM_KEY, true); // RTCLib 初始化 RCRTCConfig.Builder config = RCRTCConfig.Builder.create(); - config.enableEncoderTexture(false); + //config.enableEncoderTexture(false);//新娱美颜 需要关闭这个 RCRTCEngine.getInstance().init(MainActivity.this, config.build()); //推送跳直播间 if (getIntent().getStringExtra("liveid") != null) { @@ -1120,7 +1120,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene mMainHomeCommunityViewHolder.mValueCallback2 = null; } - public static void isClose(String isClose) { + public void isClose(String isClose) { if ("0".equals(isClose)) { isTabClose = true; rt_main_tab.setVisibility(View.INVISIBLE); diff --git a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java index 447f42024..97ef35e76 100644 --- a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java @@ -46,6 +46,7 @@ import com.yunbao.common.utils.DeviceUtils; import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.ProcessResultUtil; import com.yunbao.common.utils.RouteUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.activity.LiveAudienceActivity; @@ -145,7 +146,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View. public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); guidSvga.setImageDrawable(drawable); - guidSvga.startAnimation(); + SVGAViewUtils.playEndClear(guidSvga); } @Override diff --git a/main/src/main/java/com/yunbao/main/activity/RewardActivity.java b/main/src/main/java/com/yunbao/main/activity/RewardActivity.java index 03ad42728..77fed05c4 100644 --- a/main/src/main/java/com/yunbao/main/activity/RewardActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/RewardActivity.java @@ -46,6 +46,7 @@ import com.yunbao.common.utils.GifCacheUtil; import com.yunbao.common.utils.L; import com.yunbao.common.utils.ProcessImageUtil; import com.yunbao.common.utils.RouteUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.main.R; @@ -223,7 +224,7 @@ public class RewardActivity extends AbsActivity { SVGADrawable drawable = new SVGADrawable(videoItem); svga.setImageDrawable(drawable); svga.setLoops(1); - svga.startAnimation(); + SVGAViewUtils.playEndClear(svga); } @Override diff --git a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java index 37ec7c66d..9150749eb 100644 --- a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java @@ -33,11 +33,14 @@ import com.opensource.svgaplayer.SVGAVideoEntity; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; import com.yunbao.common.activity.AbsActivity; +import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.interfaces.CommonCallback; +import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.GifCacheUtil; import com.yunbao.common.utils.L; import com.yunbao.common.utils.RouteUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.main.R; @@ -211,8 +214,7 @@ public class ZhuangBanActivity extends AbsActivity { SVGADrawable drawable = new SVGADrawable(videoItem); svga.setImageDrawable(drawable); svga.setLoops(1); - svga.startAnimation(); - + SVGAViewUtils.playEndClear(svga); } @Override @@ -301,6 +303,21 @@ public class ZhuangBanActivity extends AbsActivity { mContext.startActivity(intent); } + /** + * 设置超皇字体颜色 + * + * @param startColor 渐变色 + * @param endColor 渐变色 + * @param contentColor 内容颜色 + */ + @JavascriptInterface + public void androidSetColor(String startColor, String endColor, String contentColor) { + IMLoginModel model = IMLoginManager.get(mContext).getUserInfo(); + model.setStartColor("#"+startColor) + .setEndColor("#"+endColor) + .setContentColor("#"+contentColor); + IMLoginManager.get(mContext).upDataUserInfo(model); + } } private void openImageChooserActivity(ValueCallback valueCallback) { diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java index 74bd1d236..e06415ee2 100644 --- a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java @@ -28,6 +28,7 @@ import com.yunbao.common.adapter.RefreshAdapter; import com.yunbao.common.bean.WeekListBean; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.live.bean.LiveBean; import com.yunbao.main.R; import com.yunbao.main.views.MainHomeLiveItemViewHolder; @@ -205,7 +206,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); week_svga.setImageDrawable(drawable); - week_svga.startAnimation(); + SVGAViewUtils.playEndClear(week_svga); Log.e("MainHomeLiveAdapter", position + " ***************" + "onComplete"); } diff --git a/main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java index 6f8522cd8..101073957 100644 --- a/main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java @@ -24,6 +24,7 @@ import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.utils.CommonIconUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.main.R; @@ -287,7 +288,7 @@ public class MainListAdapter extends RefreshAdapter { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); svga1.setImageDrawable(drawable); - svga1.startAnimation(); + SVGAViewUtils.playEndClear(svga1); } @Override @@ -362,7 +363,7 @@ public class MainListAdapter extends RefreshAdapter { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); svga2.setImageDrawable(drawable); - svga2.startAnimation(); + SVGAViewUtils.playEndClear(svga2); } @Override @@ -437,7 +438,7 @@ public class MainListAdapter extends RefreshAdapter { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); svga3.setImageDrawable(drawable); - svga3.startAnimation(); + SVGAViewUtils.playEndClear(svga3); } @Override diff --git a/main/src/main/java/com/yunbao/main/views/FloatBannerView.java b/main/src/main/java/com/yunbao/main/views/FloatBannerView.java index 8c9230469..673593b1a 100644 --- a/main/src/main/java/com/yunbao/main/views/FloatBannerView.java +++ b/main/src/main/java/com/yunbao/main/views/FloatBannerView.java @@ -35,6 +35,9 @@ public class FloatBannerView extends FrameLayout { private Handler bannerHandler = new Handler(); private int index = 0; private String Uid; + //小图标没必要用高清原图，压缩至x32可以节约内存 + private final int iconWidth=32; + private final int iconHeight=32; public FloatBannerView(Context context) { super(context); @@ -76,9 +79,9 @@ public class FloatBannerView extends FrameLayout { } list.clear(); list.addAll(mList); - ImgLoader.displayAvatar(getContext(), list.get(0).getAvatar(), clipImage3); - ImgLoader.displayAvatar(getContext(), list.get(1).getAvatar(), clipImage2); - ImgLoader.displayAvatar(getContext(), list.get(2).getAvatar(), clipImage1); + ImgLoader.displayAvatar(getContext(), list.get(0).getAvatar(), clipImage3,iconWidth,iconHeight); + ImgLoader.displayAvatar(getContext(), list.get(1).getAvatar(), clipImage2,iconWidth,iconHeight); + ImgLoader.displayAvatar(getContext(), list.get(2).getAvatar(), clipImage1,iconWidth,iconHeight); bannerHandler.post(mFlipRunnable); }); @@ -107,8 +110,8 @@ public class FloatBannerView extends FrameLayout { float targetX = bannerLayout2.getX() - bannerLayout3.getX(); float targetY = bannerLayout2.getY() - bannerLayout3.getY(); bannerLayout3.setVisibility(GONE); - ImgLoader.displayAvatar(getContext(), list.get(next).getAvatar(), clipImage3); - ImgLoader.displayAvatar(getContext(), list.get(next).getAvatar(), clipImage2); + ImgLoader.displayAvatar(getContext(), list.get(next).getAvatar(), clipImage3,iconWidth,iconHeight); + ImgLoader.displayAvatar(getContext(), list.get(next).getAvatar(), clipImage2,iconWidth,iconHeight); TranslateAnimation animationTranslate = new TranslateAnimation(0, -targetX / 1.2f, 0, -targetY / 1.2f); ScaleAnimation scaleAnimation = new ScaleAnimation(1f, 1.2f, 1f, 1.2f); AnimationSet animationSet1 = new AnimationSet(true); @@ -122,7 +125,7 @@ public class FloatBannerView extends FrameLayout { public void onAnimationStart(Animation animation) { int show = finalNext + 1; - ImgLoader.displayAvatar(getContext(), list.get(show >= list.size() ? 0 : show).getAvatar(), clipImage1); + ImgLoader.displayAvatar(getContext(), list.get(show >= list.size() ? 0 : show).getAvatar(), clipImage1,iconWidth,iconHeight); } @Override @@ -154,7 +157,7 @@ public class FloatBannerView extends FrameLayout { @Override public void onAnimationEnd(Animation animation) { - ImgLoader.displayAvatar(getContext(), list.get(finalNext).getAvatar(), clipImage4); + ImgLoader.displayAvatar(getContext(), list.get(finalNext).getAvatar(), clipImage4,iconWidth,iconHeight); index = index + 1; bannerHandler.postDelayed(mFlipRunnable, delayMillis); bannerLayout3.clearAnimation(); diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java index 82e3b5758..93418bf16 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java @@ -255,7 +255,9 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl @JavascriptInterface public void isCloseNavigation(String isClose) { - MainActivity.isClose(isClose); + if(nowMainActivity!=null) { + nowMainActivity.isClose(isClose); + } } @JavascriptInterface diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java index 673cd154a..d21ab7e8e 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java @@ -76,7 +76,7 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder { .load(bean.getContent_pic_size_three()) .into(liveType); } - ImgLoader.display(itemView.getContext(), bean.getThumb(), mCover); + ImgLoader.display(itemView.getContext(), bean.getThumb(), mCover,300,300); bgs.setVisibility(View.VISIBLE); pkico.setVisibility(View.GONE); pkAvatar.setVisibility(View.GONE); diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java index 6b9fa0235..a60493099 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java @@ -18,6 +18,7 @@ import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; import com.yunbao.common.bean.WeekListBean; import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.live.bean.LiveBean; import com.yunbao.main.R; @@ -66,7 +67,7 @@ public class MainHomeLiveWeekItemViewHolder extends RecyclerView.ViewHolder { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); weekSvga.setImageDrawable(drawable); - weekSvga.startAnimation(); + SVGAViewUtils.playEndClear(weekSvga); weekSvga.setClearsAfterStop(false); } diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java index 881f54078..35c9897c5 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java @@ -39,6 +39,7 @@ import com.yunbao.common.http.HttpCallback; import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.utils.RouteUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.AbsMainViewHolder; import com.yunbao.common.views.weight.ViewClicksAntiShake; @@ -312,7 +313,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); gift_svga.setImageDrawable(drawable); - gift_svga.startAnimation(); + SVGAViewUtils.playEndClear(gift_svga); } @Override diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java index 40ed33972..c377410a3 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java @@ -29,6 +29,7 @@ import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.utils.RouteUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.views.AbsMainViewHolder; import com.yunbao.live.activity.LiveRecordActivity; import com.yunbao.live.activity.RoomManageActivity; @@ -266,7 +267,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); gift_svga.setImageDrawable(drawable); - gift_svga.startAnimation(); + SVGAViewUtils.playEndClear(gift_svga); } @Override diff --git a/main/src/main/java/com/yunbao/main/views/UserHomeViewHolder2.java b/main/src/main/java/com/yunbao/main/views/UserHomeViewHolder2.java index 95368d061..65dfd5afb 100644 --- a/main/src/main/java/com/yunbao/main/views/UserHomeViewHolder2.java +++ b/main/src/main/java/com/yunbao/main/views/UserHomeViewHolder2.java @@ -42,6 +42,7 @@ import com.yunbao.common.http.HttpCallback; import com.yunbao.common.utils.CommonIconUtil; import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; @@ -467,7 +468,7 @@ public class UserHomeViewHolder2 extends AbsLivePageViewHolder implements LiveSh public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); gift_svga.setImageDrawable(drawable); - gift_svga.startAnimation(); + SVGAViewUtils.playEndClear(gift_svga); } @Override diff --git a/main/src/main/res/mipmap-mdpi/jindou.gif b/main/src/main/res/mipmap-mdpi/jindou.gif deleted file mode 100644 index 9334f4dd1..000000000 Binary files a/main/src/main/res/mipmap-mdpi/jindou.gif and /dev/null differ diff --git a/main/src/main/res/mipmap-xxhdpi/img_bg.png b/main/src/main/res/mipmap-xxhdpi/img_bg.png index 68608f048..77c68670d 100644 Binary files a/main/src/main/res/mipmap-xxhdpi/img_bg.png and b/main/src/main/res/mipmap-xxhdpi/img_bg.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/img_news_instructor_bg.png b/main/src/main/res/mipmap-xxhdpi/img_news_instructor_bg.png index 88fe186d1..894006d89 100644 Binary files a/main/src/main/res/mipmap-xxhdpi/img_news_instructor_bg.png and b/main/src/main/res/mipmap-xxhdpi/img_news_instructor_bg.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/img_news_online.png b/main/src/main/res/mipmap-xxhdpi/img_news_online.png index 5ff00d7e5..bd3698ad9 100644 Binary files a/main/src/main/res/mipmap-xxhdpi/img_news_online.png and b/main/src/main/res/mipmap-xxhdpi/img_news_online.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/img_search_empty.png b/main/src/main/res/mipmap-xxhdpi/img_search_empty.png index f366bb41f..168d1f1b2 100644 Binary files a/main/src/main/res/mipmap-xxhdpi/img_search_empty.png and b/main/src/main/res/mipmap-xxhdpi/img_search_empty.png differ diff --git a/settings.gradle b/settings.gradle index 9c34f6585..0685aa851 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':app', ':video', ':common', ':main', ':baidu', ':live', ':lib_country_code' -include ':FaceUnity' +//include ':FaceUnity'