You've already forked taptap2024_GJ_chidouren
Merge branch 'master' into master_mapDev
# Conflicts: # Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
This commit is contained in:
@@ -2572,8 +2572,7 @@ MonoBehaviour:
|
||||
m_AnimatedTarget: {fileID: 6555429748334898973}
|
||||
m_LayerIndex: 0
|
||||
m_ShowDebugText: 0
|
||||
m_ChildCameras:
|
||||
- {fileID: 8402593591323444239}
|
||||
m_ChildCameras: []
|
||||
m_Instructions: []
|
||||
m_DefaultBlend:
|
||||
m_Style: 1
|
||||
@@ -3100,6 +3099,40 @@ MonoBehaviour:
|
||||
m_FrequencyGain: 0
|
||||
m_Duration: 0
|
||||
m_NoiseOffsets: {x: 77.47183, y: 742.04846, z: -873.8286}
|
||||
--- !u!1 &1982721743064348531
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2541864629575127729}
|
||||
m_Layer: 0
|
||||
m_Name: audioGroup
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2541864629575127729
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1982721743064348531}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 111233004230232282}
|
||||
- {fileID: 451732744990678450}
|
||||
- {fileID: 8823954856640618564}
|
||||
m_Father: {fileID: 3470085375275940891}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2060135428308628988
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5631,6 +5664,7 @@ Transform:
|
||||
- {fileID: 2925989089492316297}
|
||||
- {fileID: 9215404511707638853}
|
||||
- {fileID: 2558686753146435160}
|
||||
- {fileID: 2541864629575127729}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!320 &5689008963380115352
|
||||
@@ -5656,6 +5690,10 @@ PlayableDirector:
|
||||
value: {fileID: 4265334704468890923}
|
||||
- key: {fileID: 4052369300484707575, guid: a0f42c2ed5438954691c7a96e22be18b, type: 2}
|
||||
value: {fileID: 837263315587074211}
|
||||
- key: {fileID: 7745874072217949768, guid: a0f42c2ed5438954691c7a96e22be18b, type: 2}
|
||||
value: {fileID: 5425414489819899930}
|
||||
- key: {fileID: -1420766138410669499, guid: a0f42c2ed5438954691c7a96e22be18b, type: 2}
|
||||
value: {fileID: 5588064883966669778}
|
||||
m_ExposedReferences:
|
||||
m_References:
|
||||
- f385fafb9f49d3c45b7e42870ccc7541: {fileID: 4313609511530685556}
|
||||
@@ -5792,7 +5830,7 @@ Transform:
|
||||
m_GameObject: {fileID: 4313609511530685556}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0.93440706, w: 0.35620716}
|
||||
m_LocalPosition: {x: 7.98, y: 0.41, z: 0}
|
||||
m_LocalPosition: {x: 16.2, y: 0.5, z: 0}
|
||||
m_LocalScale: {x: 3, y: 3, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
@@ -7274,6 +7312,134 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &5061666381656895857
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 111233004230232282}
|
||||
- component: {fileID: 5425414489819899930}
|
||||
m_Layer: 0
|
||||
m_Name: Audio Source 1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &111233004230232282
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5061666381656895857}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2541864629575127729}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &5425414489819899930
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5061666381656895857}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &5091637603520676061
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -7914,6 +8080,134 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &5888432404992568257
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8823954856640618564}
|
||||
- component: {fileID: 3903536930669143567}
|
||||
m_Layer: 0
|
||||
m_Name: Audio Source 3
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8823954856640618564
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5888432404992568257}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2541864629575127729}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &3903536930669143567
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5888432404992568257}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &5947562212996296929
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -8473,6 +8767,134 @@ Transform:
|
||||
- {fileID: 2883692017790424728}
|
||||
m_Father: {fileID: 38111775191372653}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &6159742429306993784
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 451732744990678450}
|
||||
- component: {fileID: 5588064883966669778}
|
||||
m_Layer: 0
|
||||
m_Name: Audio Source 2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &451732744990678450
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6159742429306993784}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2541864629575127729}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &5588064883966669778
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6159742429306993784}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &6178086276278350990
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
BIN
Assets/GameRes/Audio/BGM/3-Dark Fantasy Studio- I'm sorry.wav
Normal file
BIN
Assets/GameRes/Audio/BGM/3-Dark Fantasy Studio- I'm sorry.wav
Normal file
Binary file not shown.
@@ -0,0 +1,23 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3b55e2b148890cb4697ebb573db32f43
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 1
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/GameRes/Audio/SE/CG_Fore.meta
Normal file
8
Assets/GameRes/Audio/SE/CG_Fore.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 541041f219872234087922e5af702b5f
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/GameRes/Audio/SE/CG_Fore/Fire_Spell_02.wav
Normal file
BIN
Assets/GameRes/Audio/SE/CG_Fore/Fire_Spell_02.wav
Normal file
Binary file not shown.
23
Assets/GameRes/Audio/SE/CG_Fore/Fire_Spell_02.wav.meta
Normal file
23
Assets/GameRes/Audio/SE/CG_Fore/Fire_Spell_02.wav.meta
Normal file
@@ -0,0 +1,23 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 905dbd133fd14ea4c8d9c303730e8fe3
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/GameRes/Audio/SE/CG_Fore/Growl_01.wav
Normal file
BIN
Assets/GameRes/Audio/SE/CG_Fore/Growl_01.wav
Normal file
Binary file not shown.
23
Assets/GameRes/Audio/SE/CG_Fore/Growl_01.wav.meta
Normal file
23
Assets/GameRes/Audio/SE/CG_Fore/Growl_01.wav.meta
Normal file
@@ -0,0 +1,23 @@
|
||||
fileFormatVersion: 2
|
||||
guid: eae4fb2bf32ff72418f3901e45c0bf3f
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/GameRes/Audio/SE/CG_Fore/Grunt_With_Caw_03.wav
Normal file
BIN
Assets/GameRes/Audio/SE/CG_Fore/Grunt_With_Caw_03.wav
Normal file
Binary file not shown.
23
Assets/GameRes/Audio/SE/CG_Fore/Grunt_With_Caw_03.wav.meta
Normal file
23
Assets/GameRes/Audio/SE/CG_Fore/Grunt_With_Caw_03.wav.meta
Normal file
@@ -0,0 +1,23 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 231843d769658564b98394b3cd984479
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -43620,7 +43620,7 @@ SpriteRenderer:
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 2100000, guid: eeffb6faa1bbec041bb9e6318f952864, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
@@ -54949,11 +54949,7 @@ MonoBehaviour:
|
||||
m_AnimatedTarget: {fileID: 208620638564458000}
|
||||
m_LayerIndex: 0
|
||||
m_ShowDebugText: 0
|
||||
m_ChildCameras:
|
||||
- {fileID: 7171548902592501168}
|
||||
- {fileID: 266793490186691909}
|
||||
- {fileID: 2787569267291428109}
|
||||
- {fileID: 4075047884562615347}
|
||||
m_ChildCameras: []
|
||||
m_Instructions:
|
||||
- m_FullHash: -1083855402
|
||||
m_VirtualCamera: {fileID: 7171548902592501168}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using Framework.Audio;
|
||||
using Framework.Timer;
|
||||
using Framework.Utils.Extend;
|
||||
using Pathfinding;
|
||||
@@ -19,20 +20,20 @@ namespace Game.Component
|
||||
public bool HasActive = true;
|
||||
}
|
||||
|
||||
[SerializeField] protected FSMController _fsmController;
|
||||
[SerializeField] protected AILerp _aiLerp;
|
||||
public EnemyAnimState AnimState;
|
||||
|
||||
[Header ("最大活动区域")] public Vector2 ActiveArea = new Vector2 (10 , 5);
|
||||
[Header ("随机巡逻区域")] public Vector2 WalkArea = new Vector2 (5 , 5);
|
||||
[Header ("攻击检测半径")] public float TriggerDistance = -1f;
|
||||
[Header ("追逐检测半径")] public float FollowDistance = -1f;
|
||||
[Header ("攻击最小持续时间")] public float AttackStateDuration = 5f; //攻击状态最小持续时间
|
||||
[Header ("仇恨丢失冷却时间")] public float AttackCDDuration = 2f;
|
||||
[Header ("单位移动速度")] public float MaxMoveSpeed = 3;
|
||||
[Header ("常规移动速度系数"), Range (0, 1)] public float WalkSpeedOffset = 1;
|
||||
[Header ("攻击移动速度系数"), Range (0, 1)] public float AttackSpeedOffset = 1;
|
||||
[Header ("速度变化系数&插值t")] public float SpeedChangeT = 0.5f;
|
||||
[SerializeField] protected FSMController _fsmController;
|
||||
[SerializeField] protected AILerp _aiLerp;
|
||||
public EnemyAnimState AnimState;
|
||||
[Header ("攻击触发音效")] public string AttackTriggerAudioSound = "";
|
||||
[Header ("最大活动区域")] public Vector2 ActiveArea = new Vector2 (10 , 5);
|
||||
[Header ("随机巡逻区域")] public Vector2 WalkArea = new Vector2 (5 , 5);
|
||||
[Header ("攻击检测半径")] public float TriggerDistance = -1f;
|
||||
[Header ("追逐检测半径")] public float FollowDistance = -1f;
|
||||
[Header ("攻击最小持续时间")] public float AttackStateDuration = 5f; //攻击状态最小持续时间
|
||||
[Header ("仇恨丢失冷却时间")] public float AttackCDDuration = 2f;
|
||||
[Header ("单位移动速度")] public float MaxMoveSpeed = 3;
|
||||
[Header ("常规移动速度系数"), Range (0, 1)] public float WalkSpeedOffset = 1;
|
||||
[Header ("攻击移动速度系数"), Range (0, 1)] public float AttackSpeedOffset = 1;
|
||||
[Header ("速度变化系数&插值t")] public float SpeedChangeT = 0.5f;
|
||||
|
||||
private float _expSpeedOffset; //额外速度系数
|
||||
private TimeHandler _expTimeHandler; //额外速度计时器
|
||||
@@ -198,7 +199,12 @@ namespace Game.Component
|
||||
|
||||
public void UpdateSpeedState (bool hasAtk , bool anim = true)
|
||||
{
|
||||
if (this._hasAtkState == false && hasAtk)
|
||||
{
|
||||
AudioManager.Instance.PlaySound (this.AttackTriggerAudioSound);
|
||||
}
|
||||
this._hasAtkState = hasAtk;
|
||||
|
||||
var targetSpeedOffset = this._hasAtkState ? this.AttackSpeedOffset : this.WalkSpeedOffset;
|
||||
if (anim)
|
||||
{
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using Framework.Audio;
|
||||
using Framework.Timer;
|
||||
using Game.EventDefine;
|
||||
using UniFramework.Event;
|
||||
@@ -74,6 +75,7 @@ namespace Game.Component
|
||||
this.ScenePart.InitPart ();
|
||||
// this.Pathfinder.data.SetData (this.ScenePart.mapCacheData.bytes);
|
||||
// this.Pathfinder.FlushGraphUpdates ();
|
||||
AudioManager.Instance.PlayBGM (this.ScenePart.BGM , 1 , 0.65f);
|
||||
CameraManager.Instance.SetBoxCollider (this.ScenePart.cameraCollider);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,8 @@ namespace Game.Component
|
||||
public int completeConditionNumber = 10;
|
||||
public float playerBaseSpeed = 4f;
|
||||
|
||||
[Header("关卡背景音乐")]public string BGM = "";
|
||||
|
||||
[FormerlySerializedAs ("completeProp")] public SuccessProp successProp;
|
||||
|
||||
[LabelText ("当前完成数:")] private int _currentConditionNumber = 0;
|
||||
|
||||
@@ -46,7 +46,7 @@ Material:
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- Vector1_c9f2135c9d254951b22c018d295f8558: 0.003
|
||||
- _blurOffset: 0.0170278
|
||||
- _blurOffset: 0.007336116
|
||||
m_Colors: []
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &268278646524644520
|
||||
|
||||
Reference in New Issue
Block a user