Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR

2026-06-23 15:44:46 +09:00
parent ece67061d3 fecc7556d6
commit 3d7cb7bee2
167 changed files with 10237 additions and 117 deletions
--- a/Assets/04_Models/Blackjack/object/Spear.fbx
+++ b/Assets/04_Models/Blackjack/object/Spear.fbx
--- a/Assets/04_Models/Blackjack/object/Spear.fbx.meta
+++ b/Assets/04_Models/Blackjack/object/Spear.fbx.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: ed33107e6d6c54148911589b9168d604
+ModelImporter:
+  serializedVersion: 24200
+  internalIDToNameTable: []
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Spear
+    second: {fileID: 2100000, guid: da8faeba047a4bd4490df2c3994b7da5, type: 2}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    generateMeshLods: 0
+    meshLodGenerationFlags: 0
+    maximumMeshLod: -1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/04_Models/Cave/Enemy/Rhinos.controller
+++ b/Assets/04_Models/Cave/Enemy/Rhinos.controller
@@ -7,10 +7,11 @@ AnimatorState:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: WhiteRhino_Skelmesh|Rhino_Combat_Atk_Hit
+  m_Name: Hit
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 5211168254593058196}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -35,7 +36,7 @@ AnimatorStateTransition:
  m_Name: 
  m_Conditions:
  - m_ConditionMode: 1
-    m_ConditionEvent: isIdle
+    m_ConditionEvent: Hit
    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: -5762510348686555522}
@@ -46,7 +47,7 @@ AnimatorStateTransition:
  m_TransitionDuration: 0.25
  m_TransitionOffset: 0
  m_ExitTime: 0.95
-  m_HasExitTime: 1
+  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
@@ -62,7 +63,7 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 2482721225991305447}
-    m_Position: {x: 330, y: 310, z: 0}
+    m_Position: {x: 300, y: 250, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -5762510348686555522}
    m_Position: {x: 670, y: 290, z: 0}
@@ -82,11 +83,11 @@ AnimatorController:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: New Animator Controller
+  m_Name: Rhinos
  serializedVersion: 5
  m_AnimatorParameters:
-  - m_Name: isIdle
-    m_Type: 4
+  - m_Name: Hit
+    m_Type: 9
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
@@ -111,7 +112,7 @@ AnimatorState:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: WhiteRhino_Skelmesh|AA_WhiteRhino_Loco_Idle_Normal
+  m_Name: Idle
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
@@ -131,3 +132,25 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &5211168254593058196
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 2482721225991305447}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8947368
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
--- a/Assets/04_Models/Cave/Enemy/Rhinos.controller.meta
+++ b/Assets/04_Models/Cave/Enemy/Rhinos.controller.meta
--- a/Assets/04_Models/Characters/Fariy/Fairy.prefab
+++ b/Assets/04_Models/Characters/Fariy/Fairy.prefab
--- a/Assets/04_Models/Characters/Fariy/Materials/Body_Hair/Alistia_Face.mat
+++ b/Assets/04_Models/Characters/Fariy/Materials/Body_Hair/Alistia_Face.mat
@@ -14,6 +14,7 @@ Material:
  m_ValidKeywords:
  - N_F_DDMD_ON
  - N_F_EAL_ON
+  - N_F_LLI_ON
  - N_F_O_ON
  - N_F_RDC_ON
  - N_F_RELGI_ON
@@ -505,8 +506,8 @@ Material:
    - _IDMaskPrior8: 0
    - _IgnoreEncryption: 0
    - _Invisible: 0
-    - _LLI_Max: 1
-    - _LLI_Min: 0
+    - _LLI_Max: 2
+    - _LLI_Min: 1
    - _LigIgnoYNorDir: 0
    - _LightAffectOutlineColor: 0
    - _LightAffectRimLightColor: 0
@@ -596,7 +597,7 @@ Material:
    - _N_F_GLOT: 0
    - _N_F_HDLS: 0
    - _N_F_HPSS: 0
-    - _N_F_LLI: 0
+    - _N_F_LLI: 1
    - _N_F_MC: 0
    - _N_F_MSSOLTFO: 0
    - _N_F_NFD: 0
--- a/Assets/04_Models/Characters/Fariy/Materials/Body_Hair/Alistia_Hair.mat
+++ b/Assets/04_Models/Characters/Fariy/Materials/Body_Hair/Alistia_Hair.mat
@@ -14,6 +14,7 @@ Material:
  m_ValidKeywords:
  - N_F_DDMD_ON
  - N_F_EAL_ON
+  - N_F_LLI_ON
  - N_F_O_ON
  - N_F_RDC_ON
  - N_F_RELGI_ON
@@ -502,8 +503,8 @@ Material:
    - _IDMaskPrior8: 0
    - _IgnoreEncryption: 0
    - _Invisible: 0
-    - _LLI_Max: 1
-    - _LLI_Min: 0
+    - _LLI_Max: 2
+    - _LLI_Min: 1
    - _LigIgnoYNorDir: 0
    - _LightAffectOutlineColor: 0
    - _LightAffectRimLightColor: 0
@@ -593,7 +594,7 @@ Material:
    - _N_F_GLOT: 0
    - _N_F_HDLS: 0
    - _N_F_HPSS: 0
-    - _N_F_LLI: 0
+    - _N_F_LLI: 1
    - _N_F_MC: 0
    - _N_F_MSSOLTFO: 0
    - _N_F_NFD: 0
--- a/Assets/04_Models/Characters/Fariy/Materials/Cloth/Alistia_Cloth_1_Blue.mat
+++ b/Assets/04_Models/Characters/Fariy/Materials/Cloth/Alistia_Cloth_1_Blue.mat
@@ -14,6 +14,7 @@ Material:
  m_ValidKeywords:
  - N_F_DDMD_ON
  - N_F_EAL_ON
+  - N_F_LLI_ON
  - N_F_O_ON
  - N_F_RDC_ON
  - N_F_RELGI_ON
@@ -502,8 +503,8 @@ Material:
    - _IDMaskPrior8: 0
    - _IgnoreEncryption: 0
    - _Invisible: 0
-    - _LLI_Max: 1
-    - _LLI_Min: 0
+    - _LLI_Max: 2
+    - _LLI_Min: 1
    - _LigIgnoYNorDir: 0
    - _LightAffectOutlineColor: 0
    - _LightAffectRimLightColor: 0
@@ -593,7 +594,7 @@ Material:
    - _N_F_GLOT: 0
    - _N_F_HDLS: 0
    - _N_F_HPSS: 0
-    - _N_F_LLI: 0
+    - _N_F_LLI: 1
    - _N_F_MC: 0
    - _N_F_MSSOLTFO: 0
    - _N_F_NFD: 0
--- a/Assets/04_Models/Characters/Fariy/Materials/Cloth/Alistia_Cloth_1_Blue_Lace.mat
+++ b/Assets/04_Models/Characters/Fariy/Materials/Cloth/Alistia_Cloth_1_Blue_Lace.mat
@@ -14,6 +14,7 @@ Material:
  m_ValidKeywords:
  - N_F_DDMD_ON
  - N_F_EAL_ON
+  - N_F_LLI_ON
  - N_F_O_ON
  - N_F_RDC_ON
  - N_F_RELGI_ON
@@ -504,8 +505,8 @@ Material:
    - _IDMaskPrior8: 0
    - _IgnoreEncryption: 0
    - _Invisible: 0
-    - _LLI_Max: 1
-    - _LLI_Min: 0
+    - _LLI_Max: 2
+    - _LLI_Min: 1
    - _LigIgnoYNorDir: 0
    - _LightAffectOutlineColor: 0
    - _LightAffectRimLightColor: 0
@@ -595,7 +596,7 @@ Material:
    - _N_F_GLOT: 0
    - _N_F_HDLS: 0
    - _N_F_HPSS: 0
-    - _N_F_LLI: 0
+    - _N_F_LLI: 1
    - _N_F_MC: 0
    - _N_F_MSSOLTFO: 0
    - _N_F_NFD: 0
--- a/Assets/04_Models/Characters/Fariy/Materials/Cloth/Alistia_Cloth_2_Lace.mat
+++ b/Assets/04_Models/Characters/Fariy/Materials/Cloth/Alistia_Cloth_2_Lace.mat
@@ -14,6 +14,7 @@ Material:
  m_ValidKeywords:
  - N_F_DDMD_ON
  - N_F_EAL_ON
+  - N_F_LLI_ON
  - N_F_O_ON
  - N_F_RDC_ON
  - N_F_RELGI_ON
@@ -502,8 +503,8 @@ Material:
    - _IDMaskPrior8: 0
    - _IgnoreEncryption: 0
    - _Invisible: 0
-    - _LLI_Max: 1
-    - _LLI_Min: 0
+    - _LLI_Max: 2
+    - _LLI_Min: 1
    - _LigIgnoYNorDir: 0
    - _LightAffectOutlineColor: 0
    - _LightAffectRimLightColor: 0
@@ -593,7 +594,7 @@ Material:
    - _N_F_GLOT: 0
    - _N_F_HDLS: 0
    - _N_F_HPSS: 0
-    - _N_F_LLI: 0
+    - _N_F_LLI: 1
    - _N_F_MC: 0
    - _N_F_MSSOLTFO: 0
    - _N_F_NFD: 0