foldcc/taptap2024_GJ_chidouren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update core

Browse Source
This commit is contained in:
Foldcc_b1
2024-10-27 22:24:41 +08:00
parent 5227e64327
commit 8f833c5063
25 changed files with 39570 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
Assets/Art/Material/propBorder3.mat Normal file
View File

@@ -0,0 +1,158 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1469027649898407122
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: propBorder3
m_Shader: {fileID: -6465566751694194690, guid: f15679aa25ddf4c4dab3a6e191b55c32, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _FLIPBOOKBLENDING_OFF
- _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 1a42412a7c2070c479661a8f753a7558, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 7605196420d204945843c4c794c58361, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 2
- _BlendModePreserveSpecular: 1
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _ColorMode: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0.1
- _DstBlend: 1
- _DstBlendAlpha: 1
- _EnvironmentReflections: 1
- _FlipbookBlending: 0
- _FlipbookMode: 0
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _MaxHDRoffset11111_1: 1
- _Metallic: 0
- _MinHDRoffset11111: 0.642
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _Speed11111: 3.09
- _SrcBlend: 5
- _SrcBlendAlpha: 1
- _Surface: 1
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _HDR1111: {r: 8, g: 8, b: 8, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

8
Assets/Art/Material/propBorder3.mat.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0535b04ad8879e444bfa212a43c7c9e3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Art/Materials/Shader Graphs_UIWashing2.mat
View File

@@ -74,7 +74,7 @@ Material:
- _StencilWriteMask: 255
- _active_border: 0
- _border: 0
- _progress: 0
- _progress: 1
- _timeValue: 0
m_Colors:
- _Color: {r: 0, g: 0, b: 0, a: 1}

167
Assets/Art/animation/cameraVcams.controller
View File

@@ -25,6 +25,32 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-8928018358561291008
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bossCameraAnim@c7
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-8688724005701150939
AnimatorState:
serializedVersion: 6
@@ -102,6 +128,81 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3090530041345961856
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 6
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1059207915205325881}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2519246642997191803
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 7
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8928018358561291008}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-1851854709963646637
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 5
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5542701716578814600}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-1737951715438015801
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -181,6 +282,32 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &1059207915205325881
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bossCameraAnim@c6
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &3202514192174799272
AnimatorStateMachine:
serializedVersion: 6
@@ -201,13 +328,25 @@ AnimatorStateMachine:
m_Position: {x: 100, y: -190, z: 0}
- serializedVersion: 1
m_State: {fileID: -8688724005701150939}
m_Position: {x: -170, y: -110, z: 0}
m_Position: {x: -150, y: -170, z: 0}
- serializedVersion: 1
m_State: {fileID: 5542701716578814600}
m_Position: {x: -270, y: -60, z: 0}
- serializedVersion: 1
m_State: {fileID: 1059207915205325881}
m_Position: {x: -330, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: -8928018358561291008}
m_Position: {x: -440, y: 170, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: -3781036815404378253}
- {fileID: -9062212415791587371}
- {fileID: 4722247118633696834}
- {fileID: -1737951715438015801}
- {fileID: -1851854709963646637}
- {fileID: -3090530041345961856}
- {fileID: -2519246642997191803}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@@ -241,6 +380,32 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &5542701716578814600
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bossCameraAnim@c5
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &8606262313193012337
AnimatorState:
serializedVersion: 6

2
Assets/GameRes/AlwaysRes/Boss Camera C4 Box Volume Profile.asset
View File

@@ -132,7 +132,7 @@ MonoBehaviour:
m_Value: 0.9
intensity:
m_OverrideState: 1
m_Value: 15
m_Value: 3
scatter:
m_OverrideState: 1
m_Value: 0.7

2
Assets/GameRes/AlwaysRes/BossScene Volume Profile.asset
View File

@@ -90,7 +90,7 @@ MonoBehaviour:
active: 1
color:
m_OverrideState: 1
m_Value: {r: 0, g: 0.040178757, b: 0.4490565, a: 1}
m_Value: {r: 0.007981453, g: 0.026647532, b: 0.22264141, a: 1}
center:
m_OverrideState: 0
m_Value: {x: 0.5, y: 0.5}

69
Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/ChillOrganic_Medium SDF.asset
View File

File diff suppressed because one or more lines are too long

2903
Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/SourceHanSansCN-Medium SDF.asset
View File

File diff suppressed because one or more lines are too long

33
Assets/GameRes/AlwaysRes/boss cameraVcams Blends.asset
View File

@@ -57,3 +57,36 @@ MonoBehaviour:
m_PreInfinity: 0
m_PostInfinity: 0
m_RotationOrder: 0
- m_From: CM vcam1_c4
m_To: CM vcam1_c5
m_Blend:
m_Style: 1
m_Time: 3
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 0
m_PostInfinity: 0
m_RotationOrder: 0
- m_From: CM vcam1_c5
m_To: CM vcam1_c6
m_Blend:
m_Style: 1
m_Time: 3
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 0
m_PostInfinity: 0
m_RotationOrder: 0
- m_From: CM vcam1_c6
m_To: CM vcam1_c7
m_Blend:
m_Style: 1
m_Time: 5
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 0
m_PostInfinity: 0
m_RotationOrder: 0

BIN
Assets/GameRes/Audio/SE/CG_Fore/EXPLDsgn_Grenade_Explosion_01.wav Normal file
View File

Binary file not shown.

23
Assets/GameRes/Audio/SE/CG_Fore/EXPLDsgn_Grenade_Explosion_01.wav.meta Normal file
View File

@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: fabddcf461d445d49a0626736cdb094b
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:

8
Assets/GameRes/Audio/SE/CG_bark.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d34ccd3e0d15ac44f87922fe4d018f14
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/GameRes/Audio/SE/CG_bark/Fire_Earthquake.wav Normal file
View File

Binary file not shown.

23
Assets/GameRes/Audio/SE/CG_bark/Fire_Earthquake.wav.meta Normal file
View File

@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 0e6edd3675d250340ac9a9a941f36d26
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:

1687
Assets/GameRes/AutoSource/BossSceneTimeline.playable
View File

File diff suppressed because it is too large Load Diff

35301
Assets/GameRes/AutoSource/CGScene/BossScene.prefab
View File

File diff suppressed because it is too large Load Diff

146
Assets/GameRes/View/EndAboutPanel.prefab
View File

@@ -374,7 +374,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\n\u8FFD\u9010\u602A\uFF1A\u8DEF\u4EBA\u7532\r\n\u62E6\u622A\u602A\uFF1A\u8DEF\u4EBA\u4E59\r\n\u5DE1\u903B\u602A\uFF1A\u8DEF\u4EBA\u4E19\r\n\u60CA\u609A\u602A\uFF1A\u8DEF\u4EBA\u4E01\r\n\u80C6\u5C0F\u602A\uFF1A\u5C0F\u7F8E\uFF08\u5DF2\u79BB\u804C\uFF09\r\n\u75AF\u766B\u602A\uFF1A\u5C0F\u5E05\uFF08\u75C5\u5047\uFF09\r\n\u5DE8\u578B\u60CA\u609A\u602A\uFF1A\u5927\u58EE\r\n\u7EC8\u6781BOSS\uFF1A\u4E27\u5F6A"
m_text: "\u6444\u5F71\u5E08\uFF1A\u6F5C\u6C34\u5458\u5C0F\u738B\r\n\u706F\u5149\uFF1A\u6015\u6C34\u5C0F\u9ED1\r\n\u52A8\u4F5C\u6307\u5BFC\uFF1A\u5C0F\u5764\r\n\u5316\u5986\u5E08\uFF1A\u767D\u8336\u679C\u51BB\r\n\u540E\u52E4\uFF1A\u5C0F\u718A\r\n\u9F99\u5957\uFF1AFoldcc"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 44a1bcf4a4bac2c43936c2c51c7018e6, type: 2}
m_sharedMaterial: {fileID: 5897230214493880644, guid: 44a1bcf4a4bac2c43936c2c51c7018e6, type: 2}
@@ -643,6 +643,147 @@ MonoBehaviour:
IsAutoStartValue: 0
StartValue: 0
EndValue: 1
--- !u!1 &3487300523040024240
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4475755901152658651}
- component: {fileID: 6261353242623281107}
- component: {fileID: 5270486177246344290}
- component: {fileID: 8660160944459009125}
- component: {fileID: 3600645926997022552}
m_Layer: 6
m_Name: Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4475755901152658651
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3487300523040024240}
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: 6178739290977745201}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6261353242623281107
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3487300523040024240}
m_CullTransparentMesh: 1
--- !u!114 &5270486177246344290
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3487300523040024240}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!225 &8660160944459009125
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3487300523040024240}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &3600645926997022552
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3487300523040024240}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 32ce154d21b948608e0ced1e7bbb698e, type: 3}
m_Name:
m_EditorClassIdentifier:
IsAutoPlay: 1
MintPlayer:
TweenOptions:
Duration: 0.75
IsBack: 0
IsFlip: 0
IsLoop: 0
LoopCount: -1
IsCustomEase: 0
EaseType: 0
TimeCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
UpdaterTypeEnum: 2
TweenType: 1
IsLocal: 0
IsAutoStartValue: 0
StartValue: 0
EndValue: 1
--- !u!1 &3510333670845229953
GameObject:
m_ObjectHideFlags: 0
@@ -1345,6 +1486,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4475755901152658651}
- {fileID: 6491297955999234766}
- {fileID: 2249118940283569018}
- {fileID: 1592022272983404443}
@@ -2222,7 +2364,7 @@ MonoBehaviour:
IsAutoPlay: 1
MintPlayer:
TweenOptions:
Duration: 0.35
Duration: 3
IsBack: 1
IsFlip: 0
IsLoop: 1

1
Assets/Scripts/Game/RoomManager.cs
View File

@@ -61,6 +61,7 @@ namespace Game
internal void _OnExitGame ()
{
Object.Destroy (this._BossSceneDirector.gameObject);
UnBindEvent ();
this._gameFsm.Kill ();
GameUpdateMgr.Instance.RemoveUpdater (DoUpdate);

2
Assets/Scripts/System/Account/AccountSystemData.cs
View File

@@ -12,7 +12,7 @@ using UnityEngine;
public class AccountSystemData
{
public float BGMValue = 0.5f;
public float BGMValue = 1f;
public float BSEValue = 0.5f;
public float SEValue = 0.8f;

2
Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
View File

@@ -46,7 +46,7 @@ Material:
m_Ints: []
m_Floats:
- Vector1_c9f2135c9d254951b22c018d295f8558: 0.003
- _blurOffset: 0.015018618
- _blurOffset: 0.016038021
m_Colors: []
m_BuildTextureStacks: []
--- !u!114 &268278646524644520

2
Assets/Scripts/System/StateSystem/State/StateRoom.cs
View File

@@ -6,6 +6,7 @@ using Framework.FSMLite;
using Framework.GamePool.manager;
using Framework.UI;
using Game;
using Game.Component;
using Game.Data;
using Game.Manager;
using Runtime.ADAggregator;
@@ -74,6 +75,7 @@ namespace StateSystem.State
protected override void OnExit()
{
UIManager.Instance.CloseViewWithGroup (RoomGroup);
GamePoolManager.Instance.KillForGroup (RoomGroup);
GameManager.Instance.EndAutoSave ();

4
Assets/Scripts/Views/EndAboutPanel.cs
View File

@@ -2,7 +2,9 @@ using System.Collections.Generic;
using System.StateSystem;
using Framework.Audio;
using Framework.UI;
using Game;
using Game.Component;
using Game.EventDefine;
using UnityEngine;
using UnityEngine.UI;
using IcecreamView;
@@ -26,7 +28,7 @@ namespace Views
this._closeBtn.gameObject.SetActive (false);
this._closeBtn.onClick.AddListener (() =>
{
UIManager.Instance.OpenLoading (() => { GameStateManager.Instance.OpenState (GameGlobalState.GameHome); });
UIManager.Instance.OpenLoading (() => { GameEventDefine.ChangeGameFsm.SendMessage (GameState.ExitGame); });
this.ViewConnector.CloseView ();
});
}

10
Assets/Sources/EndPanelAnim/actor1Timeline.playable
View File

@@ -93,7 +93,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 6.5
time: 10
value: 1
inSlope: 0
outSlope: 0
@@ -102,7 +102,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 7.016667
time: 10.516666
value: 0
inSlope: 0
outSlope: 0
@@ -141,7 +141,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 7.016667
m_StopTime: 10.516666
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -171,7 +171,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 6.5
time: 10
value: 1
inSlope: 0
outSlope: 0
@@ -180,7 +180,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 7.016667
time: 10.516666
value: 0
inSlope: 0
outSlope: 0

10
Assets/Sources/EndPanelAnim/actor2Timeline.playable
View File

@@ -93,7 +93,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.016667
time: 10
value: 1
inSlope: 0
outSlope: 0
@@ -102,7 +102,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.5
time: 10.483334
value: 0
inSlope: 0
outSlope: 0
@@ -141,7 +141,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 4.5
m_StopTime: 10.483334
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -171,7 +171,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.016667
time: 10
value: 1
inSlope: 0
outSlope: 0
@@ -180,7 +180,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.5
time: 10.483334
value: 0
inSlope: 0
outSlope: 0

38
Assets/Sources/EndPanelAnim/logo_endTimeline.playable
View File

@@ -31,7 +31,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 9.016666
time: 11.983334
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -61,7 +61,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 6
time: 8.966666
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -70,7 +70,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 9.016666
time: 11.983334
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -100,7 +100,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3.0166667
time: 5.5
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -109,7 +109,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 6
time: 8.966666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -139,7 +139,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
time: 2
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -148,7 +148,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3.0333333
time: 5.516667
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -190,7 +190,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 11.016666
time: 15.3
value: 1
inSlope: 0
outSlope: 0
@@ -199,7 +199,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 12
time: 16.283333
value: 0
inSlope: 0
outSlope: 0
@@ -283,7 +283,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 12
m_StopTime: 16.283333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -313,7 +313,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 9.016666
time: 11.983334
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -343,7 +343,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 6
time: 8.966666
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -352,7 +352,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 9.016666
time: 11.983334
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -382,7 +382,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3.0166667
time: 5.5
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -391,7 +391,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 6
time: 8.966666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -421,7 +421,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
time: 2
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -430,7 +430,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3.0333333
time: 5.516667
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -472,7 +472,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 11.016666
time: 15.3
value: 1
inSlope: 0
outSlope: 0
@@ -481,7 +481,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 12
time: 16.283333
value: 0
inSlope: 0
outSlope: 0