update

2022-09-21 18:31:07 +08:00 · 2022-09-21 18:31:07 +08:00 · e29ecd2845
commit e29ecd2845
parent bdaa51dbb6
202 changed files with 11730 additions and 619 deletions
--- a/FaceUnity/src/main/assets/animation/animation_data.json
+++ b/FaceUnity/src/main/assets/animation/animation_data.json
--- a/FaceUnity/src/main/assets/animoji/baihu_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/baihu_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/baimao_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/baimao_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/cartoon_princess_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/cartoon_princess_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/douniuquan_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/douniuquan_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/frog_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/frog_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/hashiqi_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/hashiqi_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/hetun_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/hetun_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/huangya_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/huangya_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/kaola_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/kaola_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/kuloutou_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/kuloutou_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/qgirl_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/qgirl_Animoji.bundle
--- a/FaceUnity/src/main/assets/animoji/wuxia_Animoji.bundle
+++ b/FaceUnity/src/main/assets/animoji/wuxia_Animoji.bundle
--- a/FaceUnity/src/main/assets/effect/action/actiongame_android.bundle
+++ b/FaceUnity/src/main/assets/effect/action/actiongame_android.bundle
--- a/FaceUnity/src/main/assets/effect/ar/baozi.bundle
+++ b/FaceUnity/src/main/assets/effect/ar/baozi.bundle
--- a/FaceUnity/src/main/assets/effect/ar/bluebird.bundle
+++ b/FaceUnity/src/main/assets/effect/ar/bluebird.bundle
--- a/FaceUnity/src/main/assets/effect/ar/fenhudie.bundle
+++ b/FaceUnity/src/main/assets/effect/ar/fenhudie.bundle
--- a/FaceUnity/src/main/assets/effect/ar/lanhudie.bundle
+++ b/FaceUnity/src/main/assets/effect/ar/lanhudie.bundle
--- a/FaceUnity/src/main/assets/effect/ar/tiger.bundle
+++ b/FaceUnity/src/main/assets/effect/ar/tiger.bundle
--- a/FaceUnity/src/main/assets/effect/ar/tiger_bai.bundle
+++ b/FaceUnity/src/main/assets/effect/ar/tiger_bai.bundle
--- a/FaceUnity/src/main/assets/effect/ar/tiger_huang.bundle
+++ b/FaceUnity/src/main/assets/effect/ar/tiger_huang.bundle
--- a/FaceUnity/src/main/assets/effect/ar/xiongmao.bundle
+++ b/FaceUnity/src/main/assets/effect/ar/xiongmao.bundle
--- a/FaceUnity/src/main/assets/effect/big_head/big_head.bundle
+++ b/FaceUnity/src/main/assets/effect/big_head/big_head.bundle
--- a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp2.bundle
+++ b/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp2.bundle
--- a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp4.bundle
+++ b/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp4.bundle
--- a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp5.bundle
+++ b/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp5.bundle
--- a/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp6.bundle
+++ b/FaceUnity/src/main/assets/effect/big_head/big_head_facewarp6.bundle
--- a/FaceUnity/src/main/assets/effect/big_head/big_head_smile.bundle
+++ b/FaceUnity/src/main/assets/effect/big_head/big_head_smile.bundle
--- a/FaceUnity/src/main/assets/effect/expression/future_warrior.bundle
+++ b/FaceUnity/src/main/assets/effect/expression/future_warrior.bundle
--- a/FaceUnity/src/main/assets/effect/expression/jet_mask.bundle
+++ b/FaceUnity/src/main/assets/effect/expression/jet_mask.bundle
--- a/FaceUnity/src/main/assets/effect/expression/luhantongkuan_ztt_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/expression/luhantongkuan_ztt_fu.bundle
--- a/FaceUnity/src/main/assets/effect/expression/qingqing_ztt_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/expression/qingqing_ztt_fu.bundle
--- a/FaceUnity/src/main/assets/effect/expression/sdx2.bundle
+++ b/FaceUnity/src/main/assets/effect/expression/sdx2.bundle
--- a/FaceUnity/src/main/assets/effect/expression/xiaobianzi_zh_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/expression/xiaobianzi_zh_fu.bundle
--- a/FaceUnity/src/main/assets/effect/expression/xiaoxueshen_ztt_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/expression/xiaoxueshen_ztt_fu.bundle
--- a/FaceUnity/src/main/assets/effect/facewarp/facewarp2.bundle
+++ b/FaceUnity/src/main/assets/effect/facewarp/facewarp2.bundle
--- a/FaceUnity/src/main/assets/effect/facewarp/facewarp3.bundle
+++ b/FaceUnity/src/main/assets/effect/facewarp/facewarp3.bundle
--- a/FaceUnity/src/main/assets/effect/facewarp/facewarp4.bundle
+++ b/FaceUnity/src/main/assets/effect/facewarp/facewarp4.bundle
--- a/FaceUnity/src/main/assets/effect/facewarp/facewarp5.bundle
+++ b/FaceUnity/src/main/assets/effect/facewarp/facewarp5.bundle
--- a/FaceUnity/src/main/assets/effect/facewarp/facewarp6.bundle
+++ b/FaceUnity/src/main/assets/effect/facewarp/facewarp6.bundle
--- a/FaceUnity/src/main/assets/effect/gesture/ctrl_flower.bundle
+++ b/FaceUnity/src/main/assets/effect/gesture/ctrl_flower.bundle
--- a/FaceUnity/src/main/assets/effect/gesture/ctrl_rain.bundle
+++ b/FaceUnity/src/main/assets/effect/gesture/ctrl_rain.bundle
--- a/FaceUnity/src/main/assets/effect/gesture/ctrl_snow.bundle
+++ b/FaceUnity/src/main/assets/effect/gesture/ctrl_snow.bundle
--- a/FaceUnity/src/main/assets/effect/gesture/ssd_thread_cute.bundle
+++ b/FaceUnity/src/main/assets/effect/gesture/ssd_thread_cute.bundle
--- a/FaceUnity/src/main/assets/effect/gesture/ssd_thread_korheart.bundle
+++ b/FaceUnity/src/main/assets/effect/gesture/ssd_thread_korheart.bundle
--- a/FaceUnity/src/main/assets/effect/gesture/ssd_thread_six.bundle
+++ b/FaceUnity/src/main/assets/effect/gesture/ssd_thread_six.bundle
--- a/FaceUnity/src/main/assets/effect/landmarks.bundle
+++ b/FaceUnity/src/main/assets/effect/landmarks.bundle
--- a/FaceUnity/src/main/assets/effect/musicfilter/douyin_01.bundle
+++ b/FaceUnity/src/main/assets/effect/musicfilter/douyin_01.bundle
--- a/FaceUnity/src/main/assets/effect/musicfilter/douyin_01.mp3
+++ b/FaceUnity/src/main/assets/effect/musicfilter/douyin_01.mp3
--- a/FaceUnity/src/main/assets/effect/musicfilter/douyin_02.bundle
+++ b/FaceUnity/src/main/assets/effect/musicfilter/douyin_02.bundle
--- a/FaceUnity/src/main/assets/effect/musicfilter/douyin_02.mp3
+++ b/FaceUnity/src/main/assets/effect/musicfilter/douyin_02.mp3
--- a/FaceUnity/src/main/assets/effect/normal/cat_sparks.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/cat_sparks.bundle
--- a/FaceUnity/src/main/assets/effect/normal/daisypig.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/daisypig.bundle
--- a/FaceUnity/src/main/assets/effect/normal/fashi.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/fashi.bundle
--- a/FaceUnity/src/main/assets/effect/normal/fu_zh_fenshu.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/fu_zh_fenshu.bundle
--- a/FaceUnity/src/main/assets/effect/normal/gaoshiqing.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/gaoshiqing.bundle
--- a/FaceUnity/src/main/assets/effect/normal/newy1.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/newy1.bundle
--- a/FaceUnity/src/main/assets/effect/normal/redribbt.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/redribbt.bundle
--- a/FaceUnity/src/main/assets/effect/normal/sdlr.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/sdlr.bundle
--- a/FaceUnity/src/main/assets/effect/normal/sdlu.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/sdlu.bundle
--- a/FaceUnity/src/main/assets/effect/normal/wobushi.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/wobushi.bundle
--- a/FaceUnity/src/main/assets/effect/normal/xlong_zh_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/xlong_zh_fu.bundle
--- a/FaceUnity/src/main/assets/effect/normal/xueqiu_lm_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/normal/xueqiu_lm_fu.bundle
--- a/FaceUnity/src/main/assets/effect/segment/bg_segment.bundle
+++ b/FaceUnity/src/main/assets/effect/segment/bg_segment.bundle
--- a/FaceUnity/src/main/assets/effect/segment/boyfriend1.bundle
+++ b/FaceUnity/src/main/assets/effect/segment/boyfriend1.bundle
--- a/FaceUnity/src/main/assets/effect/segment/boyfriend2.bundle
+++ b/FaceUnity/src/main/assets/effect/segment/boyfriend2.bundle
--- a/FaceUnity/src/main/assets/effect/segment/boyfriend3.bundle
+++ b/FaceUnity/src/main/assets/effect/segment/boyfriend3.bundle
--- a/FaceUnity/src/main/assets/effect/segment/gufeng_zh_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/segment/gufeng_zh_fu.bundle
--- a/FaceUnity/src/main/assets/effect/segment/hez_ztt_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/segment/hez_ztt_fu.bundle
--- a/FaceUnity/src/main/assets/effect/segment/human_outline.bundle
+++ b/FaceUnity/src/main/assets/effect/segment/human_outline.bundle
--- a/FaceUnity/src/main/assets/effect/segment/ice_lm_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/segment/ice_lm_fu.bundle
--- a/FaceUnity/src/main/assets/effect/segment/sea_lm_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/segment/sea_lm_fu.bundle
--- a/FaceUnity/src/main/assets/effect/segment/xiandai_ztt_fu.bundle
+++ b/FaceUnity/src/main/assets/effect/segment/xiandai_ztt_fu.bundle
--- a/FaceUnity/src/main/assets/makeup/color_setup.json
+++ b/FaceUnity/src/main/assets/makeup/color_setup.json
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/chaoa.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/chaoa.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/chaomo.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/chaomo.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/chuju.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/chuju.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/chuqiu.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/chuqiu.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/diadiatu.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/diadiatu.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/dongling.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/dongling.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/dousha.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/dousha.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/gangfeng.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/gangfeng.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/guofeng.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/guofeng.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/hongfeng.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/hongfeng.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/hunxie.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/hunxie.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/jianling.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/jianling.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/linjia.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/linjia.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/naicha.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/naicha.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/nuandong.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/nuandong.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/oumei.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/oumei.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/qianzhihe.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/qianzhihe.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/renyu.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/renyu.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/rose.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/rose.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/shaonv.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/shaonv.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/tianmei.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/tianmei.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/wumei.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/wumei.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/xinggan.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/xinggan.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/yanshimao.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/yanshimao.bundle
--- a/FaceUnity/src/main/assets/makeup/combination_bundle/ziyun.bundle
+++ b/FaceUnity/src/main/assets/makeup/combination_bundle/ziyun.bundle
--- a/FaceUnity/src/main/assets/makeup/config_json/chaomo.json
+++ b/FaceUnity/src/main/assets/makeup/config_json/chaomo.json
@ -0,0 +1,89 @@
+{
+  "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
+}
--- a/Show More
+++ b/Show More