✨ feat: 添加男性角色的 motion 预设

rdmclin2 · rdmclin2 · commit 6cc02e9d062b · 2024-10-04T10:14:42.000+08:00
diff --git a/src/constants/touch.tsx b/src/constants/touch.tsx
@@ -150,76 +150,92 @@ export const DEFAULT_TOUCH_ACTION_CONFIG_MALE: TouchActionConfig = {
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.headAction.neutralA',
+      motion: MotionPresetName.MaleHappy,
     },
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.headAction.neutralB',
+      motion: MotionPresetName.MaleHappy,
     },
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.headAction.neutralC',
+      motion: MotionPresetName.MaleHappy,
     },
   ],
   [TouchAreaEnum.Arm]: [
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.armAction.neutralA',
+      motion: MotionPresetName.MaleHappy,
     },
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.armAction.neutralB',
+      motion: MotionPresetName.MaleHappy,
     },
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.armAction.neutralC',
+      motion: MotionPresetName.MaleHappy,
     },
   ],
   [TouchAreaEnum.Leg]: [
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.legAction.neutralA',
+      motion: MotionPresetName.MaleHappy,
     },
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.legAction.neutralB',
+      motion: MotionPresetName.MaleHappy,
     },
     {
       expression: VRMExpressionPresetName.Angry,
       text: 'touch.maleAction.legAction.angryA',
+      motion: MotionPresetName.MaleAngry,
     },
   ],
   [TouchAreaEnum.Chest]: [
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.chestAction.neutralA',
+      motion: MotionPresetName.MaleHappy,
     },
     {
       expression: VRMExpressionPresetName.BlinkLeft,
       text: 'touch.maleAction.chestAction.blinkLeftA',
+      motion: MotionPresetName.MaleHappy,
     },
   ],
   [TouchAreaEnum.Belly]: [
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.bellyAction.neutralA',
+      motion: MotionPresetName.MaleHappy,
     },
     {
       expression: VRMExpressionPresetName.Happy,
       text: 'touch.maleAction.bellyAction.happyA',
+      motion: MotionPresetName.MaleHappy,
     },
     {
       expression: VRMExpressionPresetName.Neutral,
       text: 'touch.maleAction.bellyAction.neutralB',
+      motion: MotionPresetName.MaleHappy,
     },
   ],
   [TouchAreaEnum.Buttocks]: [
     {
       expression: VRMExpressionPresetName.Surprised,
       text: 'touch.maleAction.buttocksAction.surprisedA',
+      motion: MotionPresetName.MaleAngry,
     },
     {
       expression: VRMExpressionPresetName.Angry,
       text: 'touch.maleAction.buttocksAction.angryA',
+      motion: MotionPresetName.MaleAngry,
     },
   ],
 };
diff --git a/src/libs/emoteController/motionPresetMap.ts b/src/libs/emoteController/motionPresetMap.ts
@@ -16,6 +16,8 @@ export enum MotionPresetName {
   FemaleCoverChest = 'female_cover_chest',
   FemaleStand = 'female_stand',
   FemaleStandMix = 'female_stand_mix',
+  MaleHappy = 'male_happy',
+  MaleAngry = 'male_angry',
 }
 
 export const motionPresetMap: Record<
@@ -36,11 +38,21 @@ export const motionPresetMap: Record<
     type: MotionFileType.FBX,
     name: 'Female/Happy',
   },
+  male_happy: {
+    url: 'https://r2.vidol.chat/animations/c9ccf37e-b96c-11e4-a802-0aaa78deedf9.fbx',
+    type: MotionFileType.FBX,
+    name: 'Male/Happy',
+  },
   female_angry: {
     url: 'https://r2.vidol.chat/animations/c9c98b02-b96c-11e4-a802-0aaa78deedf9.fbx',
     type: MotionFileType.FBX,
     name: 'Female/Angry',
   },
+  male_angry: {
+    url: 'https://r2.vidol.chat/animations/c9c916ce-b96c-11e4-a802-0aaa78deedf9.fbx',
+    type: MotionFileType.FBX,
+    name: 'Male/Angry',
+  },
   female_greeting: {
     url: 'https://r2.vidol.chat/animations/c9c7996a-b96c-11e4-a802-0aaa78deedf9.fbx',
     type: MotionFileType.FBX,
diff --git a/src/locales/default/role.ts b/src/locales/default/role.ts
@@ -119,6 +119,11 @@ export default {
         relaxedA: '醒醒，我们之间没有结果的!',
         relaxedB: '讨厌！我可要生气啦！',
       },
+      buttocksAction: {
+        surprisedA: '啊!你在摸哪里?!',
+        angryA: '你这个变态!离我远点!',
+        embarrassedA: '呜...不要这样...',
+      },
     },
     maleAction: {
       headAction: {
@@ -145,6 +150,10 @@ export default {
         happyA: '别挠痒痒，小心我笑出腹肌',
         neutralB: '看到我这团腹肌了吗？它们只是藏得比较深罢了',
       },
+      buttocksAction: {
+        surprisedA: '嘿!注意你的手!',
+        angryA: '再碰我就揍你了!',
+      },
     },
   },
   info: {
