Merge branch 'main' of http://192.168.10.102:30008/dal4segno/Northbound

2026-02-14 17:46:10 +09:00
parent e451d95e0e 25f5db2e16
commit 17457b2e7e
15 changed files with 63891 additions and 30 deletions
--- a/Assets/Animations/MonsterAnimationController.controller
+++ b/Assets/Animations/MonsterAnimationController.controller
@@ -80,6 +80,12 @@ AnimatorController:
    m_DefaultInt: 0
    m_DefaultBool: 0
    m_Controller: {fileID: 9100000}
+  - m_Name: bIsDeath
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@@ -191,7 +197,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: df1a5739c2bbeb740bbbd5c3a4e28906, type: 2}
+  m_Motion: {fileID: -1923750366902163184, guid: 2632f2cc035d62d41bca411a318fbe36, type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
@@ -214,10 +220,11 @@ AnimatorStateMachine:
    m_Position: {x: 390, y: 120, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 3895323774234557799}
-    m_Position: {x: 475.1565, y: 240.75717, z: 0}
+    m_Position: {x: 390, y: 220, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions:
  - {fileID: 1407797717177975804}
+  - {fileID: 8516396118002013951}
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
@@ -226,3 +233,28 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 710, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 2543178704363584614}
+--- !u!1101 &8516396118002013951
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: bIsDeath
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 3895323774234557799}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
--- a/Assets/Animations/PlayerAnimationController.controller
+++ b/Assets/Animations/PlayerAnimationController.controller
@@ -70,6 +70,57 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1102 &-6405359010994864473
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Death
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -1923750366902163184, guid: 2632f2cc035d62d41bca411a318fbe36, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-6260076695452185276
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: bIsDeath
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6405359010994864473}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-6201445603492837203
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -138,10 +189,14 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: 6580572526695193822}
    m_Position: {x: 70, y: -130, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -6405359010994864473}
+    m_Position: {x: 530, y: -130, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions:
  - {fileID: -6201445603492837203}
  - {fileID: -5251586739186328965}
+  - {fileID: -6260076695452185276}
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
@@ -177,6 +232,12 @@ AnimatorController:
    m_DefaultInt: 0
    m_DefaultBool: 0
    m_Controller: {fileID: 9100000}
+  - m_Name: bIsDeath
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
--- a/Assets/Fonts/Pretendard-Bold
+++ b/Assets/Fonts/Pretendard-Bold
--- a/Assets/Fonts/Pretendard-Bold
+++ b/Assets/Fonts/Pretendard-Bold
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 93c3fa47733f46e46a3b4d495532734e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Fonts/Pretendard-Bold.ttf
+++ b/Assets/Fonts/Pretendard-Bold.ttf
--- a/Assets/Fonts/Pretendard-Bold.ttf.meta
+++ b/Assets/Fonts/Pretendard-Bold.ttf.meta
@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: fc4726771fe55b34284e8ba8ffd5159d
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Pretendard
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Fonts/Pretendard-ExtraBold
+++ b/Assets/Fonts/Pretendard-ExtraBold
--- a/Assets/Fonts/Pretendard-ExtraBold
+++ b/Assets/Fonts/Pretendard-ExtraBold
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cac3ad1b064570d46abc7f664d02d23e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Fonts/Pretendard-ExtraBold.ttf
+++ b/Assets/Fonts/Pretendard-ExtraBold.ttf
--- a/Assets/Fonts/Pretendard-ExtraBold.ttf.meta
+++ b/Assets/Fonts/Pretendard-ExtraBold.ttf.meta
@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 5e6df09b8abf3d04d846307a424fedc2
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Pretendard
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Fonts/Pretendard-Medium
+++ b/Assets/Fonts/Pretendard-Medium
--- a/Assets/Fonts/Pretendard-Medium
+++ b/Assets/Fonts/Pretendard-Medium
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 72491e21fef70124c9ebc25ff62fd3e9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Fonts/Pretendard-Medium.ttf
+++ b/Assets/Fonts/Pretendard-Medium.ttf
--- a/Assets/Fonts/Pretendard-Medium.ttf.meta
+++ b/Assets/Fonts/Pretendard-Medium.ttf.meta
@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 343ba201bb29a0d468c7c9da2f75b603
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Pretendard
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/GameMain.unity
+++ b/Assets/Scenes/GameMain.unity
@@ -190,7 +190,6 @@ GameObject:
  - component: {fileID: 306979657}
  - component: {fileID: 306979658}
  - component: {fileID: 306979659}
-  - component: {fileID: 306979660}
  m_Layer: 5
  m_Name: CoreResourceText
  m_TagString: Untagged
@@ -247,8 +246,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: New Text
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 52310d2f5a2eaaf49bdaf92c08c5eb78, type: 2}
-  m_sharedMaterial: {fileID: 3669596862895025436, guid: 52310d2f5a2eaaf49bdaf92c08c5eb78, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
+  m_sharedMaterial: {fileID: 9147849279665769802, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@@ -272,8 +271,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 32
-  m_fontSizeBase: 32
+  m_fontSize: 48
+  m_fontSizeBase: 48
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
@@ -317,21 +316,6 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &306979660
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 306979656}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Outline
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
 --- !u!114 &426416072 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 3527438615093708816, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
@@ -412,9 +396,9 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.GameResourceUI
  coreResourceText: {fileID: 306979659}
-  coreFontAsset: {fileID: 11400000, guid: 52310d2f5a2eaaf49bdaf92c08c5eb78, type: 2}
+  coreFontAsset: {fileID: 11400000, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
  playerResourceText: {fileID: 908127336}
-  playerFontAsset: {fileID: 11400000, guid: 52310d2f5a2eaaf49bdaf92c08c5eb78, type: 2}
+  playerFontAsset: {fileID: 11400000, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
  showPlayerResource: 1
  corePrefix: "\uCF54\uC5B4: "
  playerPrefix: "\uBCF4\uC720: "
@@ -1266,8 +1250,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: New Text
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 52310d2f5a2eaaf49bdaf92c08c5eb78, type: 2}
-  m_sharedMaterial: {fileID: 3669596862895025436, guid: 52310d2f5a2eaaf49bdaf92c08c5eb78, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
+  m_sharedMaterial: {fileID: 9147849279665769802, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@@ -1291,8 +1275,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 24
-  m_fontSizeBase: 24
+  m_fontSize: 32
+  m_fontSizeBase: 32
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
@@ -1360,7 +1344,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 160, y: -70}
+  m_AnchoredPosition: {x: 160, y: -80}
  m_SizeDelta: {x: 300, y: 40}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &946527916
@@ -1638,7 +1622,7 @@ RectTransform:
  m_AnchorMin: {x: 1, y: 1}
  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: -10, y: -10}
-  m_SizeDelta: {x: 300, y: 100}
+  m_SizeDelta: {x: 400, y: 150}
  m_Pivot: {x: 1, y: 1}
 --- !u!114 &1053830689
 MonoBehaviour:
@@ -3034,6 +3018,18 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 1458057163}
    m_Modifications:
+    - target: {fileID: 6229771057903500009, guid: a470599cc0481164ab487ecf39b1ebd0, type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
+    - target: {fileID: 6229771057903500009, guid: a470599cc0481164ab487ecf39b1ebd0, type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 9147849279665769802, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
+    - target: {fileID: 6229771057903500009, guid: a470599cc0481164ab487ecf39b1ebd0, type: 3}
+      propertyPath: m_hasFontAssetChanged
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 7069311196915176776, guid: a470599cc0481164ab487ecf39b1ebd0, type: 3}
      propertyPath: m_Name
      value: BuildButton
@@ -3276,6 +3272,62 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1581287801753859020, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_text
+      value: "\uD55C\uAE00"
+      objectReference: {fileID: 0}
+    - target: {fileID: 1581287801753859020, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_fontSize
+      value: 32
+      objectReference: {fileID: 0}
+    - target: {fileID: 1581287801753859020, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
+    - target: {fileID: 1581287801753859020, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_fontSizeBase
+      value: 32
+      objectReference: {fileID: 0}
+    - target: {fileID: 1581287801753859020, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 9147849279665769802, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
+    - target: {fileID: 1581287801753859020, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_hasFontAssetChanged
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2582867002339244114, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_fontSize
+      value: 48
+      objectReference: {fileID: 0}
+    - target: {fileID: 2582867002339244114, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
+    - target: {fileID: 2582867002339244114, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_fontSizeBase
+      value: 48
+      objectReference: {fileID: 0}
+    - target: {fileID: 2582867002339244114, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 9147849279665769802, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
+    - target: {fileID: 2582867002339244114, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_hasFontAssetChanged
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3527438615093708816, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
+    - target: {fileID: 3527438615093708816, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 9147849279665769802, guid: 72491e21fef70124c9ebc25ff62fd3e9, type: 2}
+    - target: {fileID: 3527438615093708816, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
+      propertyPath: m_hasFontAssetChanged
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6755115372469082952, guid: 348c7681306990746bb7cab7a386be1e, type: 3}
      propertyPath: m_Name
      value: DescriptionPanel