Merge remote-tracking branch 'upstream/master' into origin/TA/FX

master
thanhtu 2024-04-19 18:01:11 +07:00
commit 7111144476
85 changed files with 2400 additions and 1497 deletions

View File

@ -1,5 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2b401697cdf0bc04fa20a817815f9e83 guid: 02a03c8afe76d0b40a193f946fa97f6c
folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -0,0 +1,277 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0, y: -0.05, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.26666668
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0.37500003, z: 0}
outSlope: {x: 0, y: 0.37500003, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.4
value: {x: 0, y: 0.05, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Sprite
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: f3f45ffad0a0f724fa5e3f96c5abfb07, type: 3}
- time: 0.13333334
value: {fileID: 21300000, guid: f72252719cb7b834ab35bbf09a624bb1, type: 3}
- time: 0.26666668
value: {fileID: 21300000, guid: 918798f573803bf4a9bacafbfa817d99, type: 3}
- time: 0.4
value: {fileID: 21300000, guid: 2875503082f45194cb9f4d7ad3db3174, type: 3}
attribute: m_Sprite
path: Sprite
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 850496168
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 850496168
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: f3f45ffad0a0f724fa5e3f96c5abfb07, type: 3}
- {fileID: 21300000, guid: f72252719cb7b834ab35bbf09a624bb1, type: 3}
- {fileID: 21300000, guid: 918798f573803bf4a9bacafbfa817d99, type: 3}
- {fileID: 21300000, guid: 2875503082f45194cb9f4d7ad3db3174, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.4166667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 1
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.26666668
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.4
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Sprite
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: -0.05
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.26666668
value: 0
inSlope: 0.37500003
outSlope: 0.37500003
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.4
value: 0.05
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Sprite
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.26666668
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.4
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Sprite
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9bd765e1432ff254b8d69be763559a4d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 5046882983908473528}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &4440803417046413200
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
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: 7400000, guid: 9bd765e1432ff254b8d69be763559a4d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &5046882983908473528
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 4440803417046413200}
m_Position: {x: 40, y: 220, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 4440803417046413200}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d666ef1912047444e802d74c865d50f5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

Binary file not shown.

View File

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

View File

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

Binary file not shown.

View File

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

Binary file not shown.

View File

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

Binary file not shown.

View File

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

View File

@ -0,0 +1,144 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6800368102024969440
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3414060806582050965}
- component: {fileID: 3531307783657499652}
- component: {fileID: 1426704344198208110}
m_Layer: 0
m_Name: AudioObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3414060806582050965
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6800368102024969440}
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &3531307783657499652
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6800368102024969440}
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!114 &1426704344198208110
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6800368102024969440}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 13764e07dae44438af3c34c696585cde, type: 3}
m_Name:
m_EditorClassIdentifier:
_source: {fileID: 3531307783657499652}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fbd952bd368d28a4790d87f6a55878e8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -50,6 +50,6 @@ MonoBehaviour:
- GadGame.State.MainFlowState.ViewedState - GadGame.State.MainFlowState.ViewedState
- GadGame.State.MainFlowState.EngageState - GadGame.State.MainFlowState.EngageState
- GadGame.State.MainFlowState.PlayGameState - GadGame.State.MainFlowState.PlayGameState
- GadGame.State.MainFlowState.RewardState - GadGame.State.MainFlowState.CTAState
- GadGame.State.MainFlowState.CTAState - GadGame.State.MainFlowState.CTAState
SceneFlowConfig: {fileID: 11400000, guid: 191a17431b0adcb48aea29fa675b8c5a, type: 2} SceneFlowConfig: {fileID: 11400000, guid: 191a17431b0adcb48aea29fa675b8c5a, type: 2}

View File

@ -15,23 +15,23 @@ MonoBehaviour:
IdleScene: IdleScene:
_sceneAsset: {fileID: 102900000, guid: 632910d4b45f36a478868b8cdc4b3ec2, type: 3} _sceneAsset: {fileID: 102900000, guid: 632910d4b45f36a478868b8cdc4b3ec2, type: 3}
_isDirty: 0 _isDirty: 0
_scenePath: Assets/GadGame/Scenes/Scene 1.unity _scenePath: Assets/GadGame/Scenes/Idle.unity
PassByScene: PassByScene:
_sceneAsset: {fileID: 102900000, guid: c9e32be920223db4eb26536f66c3d91a, type: 3} _sceneAsset: {fileID: 102900000, guid: c9e32be920223db4eb26536f66c3d91a, type: 3}
_isDirty: 0 _isDirty: 0
_scenePath: Assets/GadGame/Scenes/Scene 2.unity _scenePath: Assets/GadGame/Scenes/PassBy.unity
ViewedScene: ViewedScene:
_sceneAsset: {fileID: 102900000, guid: f55162ea91535d84290df33ce2b3c2fb, type: 3} _sceneAsset: {fileID: 102900000, guid: f55162ea91535d84290df33ce2b3c2fb, type: 3}
_isDirty: 0 _isDirty: 0
_scenePath: Assets/GadGame/Scenes/Scene 3.unity _scenePath: Assets/GadGame/Scenes/Viewer.unity
EndGageScene: EndGageScene:
_sceneAsset: {fileID: 102900000, guid: cdaaa0ee6b3b73b4b9f984ca2bf1d535, type: 3} _sceneAsset: {fileID: 102900000, guid: cdaaa0ee6b3b73b4b9f984ca2bf1d535, type: 3}
_isDirty: 0 _isDirty: 0
_scenePath: Assets/GadGame/Scenes/Scene 4.unity _scenePath: Assets/GadGame/Scenes/Engage.unity
GameScene: GameScene:
_sceneAsset: {fileID: 102900000, guid: 79d05a23a33b9504c8ae8344c73927fe, type: 3} _sceneAsset: {fileID: 102900000, guid: 79d05a23a33b9504c8ae8344c73927fe, type: 3}
_isDirty: 0 _isDirty: 0
_scenePath: Assets/GadGame/Scenes/Scene 5.unity _scenePath: Assets/GadGame/Scenes/Game.unity
RewardScene: RewardScene:
_sceneAsset: {fileID: 102900000, guid: 2b401697cdf0bc04fa20a817815f9e83, type: 3} _sceneAsset: {fileID: 102900000, guid: 2b401697cdf0bc04fa20a817815f9e83, type: 3}
_isDirty: 0 _isDirty: 0
@ -39,4 +39,4 @@ MonoBehaviour:
CTAScene: CTAScene:
_sceneAsset: {fileID: 102900000, guid: 46cab2f289b2fed4bb929899e3c5cf4b, type: 3} _sceneAsset: {fileID: 102900000, guid: 46cab2f289b2fed4bb929899e3c5cf4b, type: 3}
_isDirty: 0 _isDirty: 0
_scenePath: Assets/GadGame/Scenes/Scene 7.unity _scenePath: Assets/GadGame/Scenes/CTA.unity

View File

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

View File

@ -0,0 +1,140 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4968dbf204c349aba96b27b0dedc9c34, type: 3}
m_Name: Sound Config
m_EditorClassIdentifier:
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects:
- {fileID: 8300000, guid: 1f255802e1ba11d4db429a2e8d1a5868, type: 3}
- {fileID: 8300000, guid: 394f241977ac3b741ba5fab2ef1f0889, type: 3}
- {fileID: 8300000, guid: 82187347dfa0a2c47ad1e530450b7139, type: 3}
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes:
- Name: Musics
Entry: 7
Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UnityEngine.AudioClip,
UnityEngine.AudioModule]], mscorlib
- Name: comparer
Entry: 7
Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
mscorlib]], mscorlib
- Name:
Entry: 8
Data:
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: BG
- Name: $v
Entry: 10
Data: 0
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name: Sounds
Entry: 7
Data: 2|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UnityEngine.AudioClip,
UnityEngine.AudioModule]], mscorlib
- Name: comparer
Entry: 7
Data: 3|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
mscorlib]], mscorlib
- Name:
Entry: 8
Data:
- Name:
Entry: 12
Data: 5
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: Start
- Name: $v
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: TimeUp
- Name: $v
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: Result
- Name: $v
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: CollectStar
- Name: $v
Entry: 10
Data: 1
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: GetHit
- Name: $v
Entry: 10
Data: 2
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
AudioObjectPrefab: {fileID: 1426704344198208110, guid: fbd952bd368d28a4790d87f6a55878e8, type: 3}
_soundDefineFileSavePath: GadGame/Scripts

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a8c84b7533c25104c937ec0987c6185f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -191,6 +191,76 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &583976853
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 583976854}
- component: {fileID: 583976855}
m_Layer: 5
m_Name: Video Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &583976854
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 583976853}
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: 1939570967}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 540, y: 960}
m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!328 &583976855
VideoPlayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 583976853}
m_Enabled: 1
m_VideoClip: {fileID: 32900000, guid: 99ea5be85f0eb0244a76574702d66fa4, type: 3}
m_TargetCameraAlpha: 1
m_TargetCamera3DLayout: 0
m_TargetCamera: {fileID: 1302683601}
m_TargetTexture: {fileID: 0}
m_TimeReference: 0
m_TargetMaterialRenderer: {fileID: 0}
m_TargetMaterialProperty: <noninit>
m_RenderMode: 0
m_AspectRatio: 2
m_DataSource: 0
m_TimeUpdateMode: 2
m_PlaybackSpeed: 1
m_AudioOutputMode: 2
m_TargetAudioSources: []
m_DirectAudioVolumes: []
m_Url:
m_EnabledAudioTracks:
m_DirectAudioMutes:
m_ControlledAudioTrackCount: 0
m_PlayOnAwake: 1
m_SkipOnDrop: 1
m_Looping: 1
m_WaitForFirstFrame: 1
m_FrameReadyEventEnabled: 0
m_VideoShaders: []
--- !u!1 &731571811 --- !u!1 &731571811
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -208,7 +278,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &731571812 --- !u!224 &731571812
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -547,6 +617,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 731571812} - {fileID: 731571812}
- {fileID: 583976854}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -280,7 +280,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -100} m_AnchoredPosition: {x: 20, y: -100}
m_SizeDelta: {x: 350, y: 50} m_SizeDelta: {x: 350, y: 50}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &169808670 --- !u!114 &169808670
@ -1138,7 +1138,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 175.01001, y: 161} m_AnchoredPosition: {x: 175.01025, y: 161}
m_SizeDelta: {x: 350.02, y: 350.02002} m_SizeDelta: {x: 350.02, y: 350.02002}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &755912838 --- !u!114 &755912838
@ -1372,12 +1372,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 998003724} m_GameObject: {fileID: 998003724}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 90}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1939570967} m_Father: {fileID: 1281411708}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -1693,7 +1693,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -100} m_AnchoredPosition: {x: -20, y: -100}
m_SizeDelta: {x: 200, y: 50} m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 1, y: 1} m_Pivot: {x: 1, y: 1}
--- !u!1 &1254852289 --- !u!1 &1254852289
@ -1705,9 +1705,9 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1254852291} - component: {fileID: 1254852291}
- component: {fileID: 1254852290}
- component: {fileID: 1254852292} - component: {fileID: 1254852292}
- component: {fileID: 1254852293} - component: {fileID: 1254852293}
- component: {fileID: 1254852294}
m_Layer: 7 m_Layer: 7
m_Name: basket m_Name: basket
m_TagString: Untagged m_TagString: Untagged
@ -1715,58 +1715,6 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!212 &1254852290
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1254852289}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 10
m_Sprite: {fileID: 21300000, guid: 24423cedb61bcd64cacfbcbb61c316d1, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &1254852291 --- !u!4 &1254852291
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1777,9 +1725,10 @@ Transform:
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1.35, z: 0} m_LocalPosition: {x: 0, y: -1.35, z: 0}
m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: [] m_Children:
- {fileID: 1369968915}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1254852292 --- !u!61 &1254852292
@ -1814,18 +1763,18 @@ BoxCollider2D:
m_IsTrigger: 1 m_IsTrigger: 1
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_UsedByComposite: 0
m_Offset: {x: 0.008484483, y: -0.018664032} m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty: m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
oldSize: {x: 2.48, y: 2.17} oldSize: {x: 3.36, y: 2.55}
newSize: {x: 1, y: 1} newSize: {x: 3.36, y: 2.55}
adaptiveTilingThreshold: 0.5 adaptiveTilingThreshold: 0.5
drawMode: 0 drawMode: 0
adaptiveTiling: 0 adaptiveTiling: 0
m_AutoTiling: 0 m_AutoTiling: 0
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 2.4514997, y: 1.8070934} m_Size: {x: 2.7, y: 2}
m_EdgeRadius: 0 m_EdgeRadius: 0
--- !u!114 &1254852293 --- !u!114 &1254852293
MonoBehaviour: MonoBehaviour:
@ -1839,6 +1788,28 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: df6e5f7aaa2a4ca39b9691ca48648ab3, type: 3} m_Script: {fileID: 11500000, guid: df6e5f7aaa2a4ca39b9691ca48648ab3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Active: 1
--- !u!95 &1254852294
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1254852289}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: d666ef1912047444e802d74c865d50f5, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &1278601754 --- !u!1 &1278601754
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1973,6 +1944,90 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1278601754} m_GameObject: {fileID: 1278601754}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1281411705
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1281411708}
- component: {fileID: 1281411707}
- component: {fileID: 1281411706}
m_Layer: 5
m_Name: BgCanvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1281411706
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1281411705}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1080, y: 1920}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 1
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &1281411707
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1281411705}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 1302683601}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &1281411708
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1281411705}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 998003725}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &1296030946 --- !u!1 &1296030946
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2231,6 +2286,90 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1324683897} m_GameObject: {fileID: 1324683897}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1369968914
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1369968915}
- component: {fileID: 1369968916}
m_Layer: 7
m_Name: Sprite
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1369968915
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1369968914}
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: 1254852291}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1369968916
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1369968914}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 10
m_Sprite: {fileID: 21300000, guid: f3f45ffad0a0f724fa5e3f96c5abfb07, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 2.48, y: 2.17}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1388120848 --- !u!1 &1388120848
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3532,7 +3671,7 @@ MonoBehaviour:
m_ScaleFactor: 1 m_ScaleFactor: 1
m_ReferenceResolution: {x: 1080, y: 1920} m_ReferenceResolution: {x: 1080, y: 1920}
m_ScreenMatchMode: 0 m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 1
m_PhysicalUnit: 3 m_PhysicalUnit: 3
m_FallbackScreenDPI: 96 m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96 m_DefaultSpriteDPI: 96
@ -3559,7 +3698,7 @@ Canvas:
m_AdditionalShaderChannelsFlag: 25 m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0 m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 100
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!224 &1939570967 --- !u!224 &1939570967
RectTransform: RectTransform:
@ -3573,7 +3712,6 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 998003725}
- {fileID: 1230716512} - {fileID: 1230716512}
- {fileID: 169808669} - {fileID: 169808669}
- {fileID: 755912837} - {fileID: 755912837}
@ -4112,7 +4250,7 @@ MonoBehaviour:
- GadGame.State.GameState.PlayingGameState - GadGame.State.GameState.PlayingGameState
- GadGame.State.GameState.EndGameState - GadGame.State.GameState.EndGameState
GameTime: 60 GameTime: 60
_basket: {fileID: 1254852291} _basket: {fileID: 1254852293}
_lerp: 10 _lerp: 10
_spawnTime: 0.5 _spawnTime: 0.5
_bombChange: 0.1 _bombChange: 0.1
@ -4175,4 +4313,5 @@ SceneRoots:
- {fileID: 819000664} - {fileID: 819000664}
- {fileID: 1254852291} - {fileID: 1254852291}
- {fileID: 655028318} - {fileID: 655028318}
- {fileID: 1281411708}
- {fileID: 1939570967} - {fileID: 1939570967}

View File

@ -123,6 +123,76 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &161708296
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 161708297}
- component: {fileID: 161708298}
m_Layer: 5
m_Name: Video Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &161708297
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 161708296}
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: 1939570967}
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!328 &161708298
VideoPlayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 161708296}
m_Enabled: 1
m_VideoClip: {fileID: 32900000, guid: 4989e7f639a1abc44b2aa49494c35025, type: 3}
m_TargetCameraAlpha: 1
m_TargetCamera3DLayout: 0
m_TargetCamera: {fileID: 1302683601}
m_TargetTexture: {fileID: 8400000, guid: 1fe45696d0b789c45a3b888ec1910e4b, type: 2}
m_TimeReference: 0
m_TargetMaterialRenderer: {fileID: 0}
m_TargetMaterialProperty: <noninit>
m_RenderMode: 0
m_AspectRatio: 2
m_DataSource: 0
m_TimeUpdateMode: 2
m_PlaybackSpeed: 1
m_AudioOutputMode: 2
m_TargetAudioSources: []
m_DirectAudioVolumes: []
m_Url:
m_EnabledAudioTracks:
m_DirectAudioMutes:
m_ControlledAudioTrackCount: 0
m_PlayOnAwake: 1
m_SkipOnDrop: 1
m_Looping: 1
m_WaitForFirstFrame: 1
m_FrameReadyEventEnabled: 0
m_VideoShaders: []
--- !u!1 &535544408 --- !u!1 &535544408
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -208,7 +278,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &731571812 --- !u!224 &731571812
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -302,7 +372,7 @@ Camera:
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_ClearFlags: 2 m_ClearFlags: 2
m_BackGroundColor: {r: 0.121568635, g: 0.09411766, b: 0.03137255, a: 1} m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
m_projectionMatrixMode: 1 m_projectionMatrixMode: 1
m_GateFitMode: 2 m_GateFitMode: 2
m_FOVAxisMode: 0 m_FOVAxisMode: 0
@ -547,6 +617,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 731571812} - {fileID: 731571812}
- {fileID: 161708297}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}

View File

@ -191,6 +191,10 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 1420233298793990163, guid: 99565b922ec123246acb5c52e20d4268, type: 3}
propertyPath: _availableStates.Array.size
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2776487287735717898, guid: 99565b922ec123246acb5c52e20d4268, type: 3} - target: {fileID: 2776487287735717898, guid: 99565b922ec123246acb5c52e20d4268, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1

View File

@ -208,7 +208,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &731571812 --- !u!224 &731571812
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -452,6 +452,76 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1490140568
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1490140569}
- component: {fileID: 1490140570}
m_Layer: 5
m_Name: Video Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1490140569
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1490140568}
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: 1939570967}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 540, y: 960}
m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!328 &1490140570
VideoPlayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1490140568}
m_Enabled: 1
m_VideoClip: {fileID: 32900000, guid: 20e43a7fab8ea014b98805750625d186, type: 3}
m_TargetCameraAlpha: 1
m_TargetCamera3DLayout: 0
m_TargetCamera: {fileID: 1302683601}
m_TargetTexture: {fileID: 0}
m_TimeReference: 0
m_TargetMaterialRenderer: {fileID: 0}
m_TargetMaterialProperty: <noninit>
m_RenderMode: 0
m_AspectRatio: 2
m_DataSource: 0
m_TimeUpdateMode: 2
m_PlaybackSpeed: 1
m_AudioOutputMode: 2
m_TargetAudioSources: []
m_DirectAudioVolumes: []
m_Url:
m_EnabledAudioTracks:
m_DirectAudioMutes:
m_ControlledAudioTrackCount: 0
m_PlayOnAwake: 1
m_SkipOnDrop: 1
m_Looping: 1
m_WaitForFirstFrame: 1
m_FrameReadyEventEnabled: 0
m_VideoShaders: []
--- !u!1 &1939570963 --- !u!1 &1939570963
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -547,6 +617,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 731571812} - {fileID: 731571812}
- {fileID: 1490140569}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}

File diff suppressed because it is too large Load Diff

View File

@ -208,7 +208,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &731571812 --- !u!224 &731571812
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -547,6 +547,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 731571812} - {fileID: 731571812}
- {fileID: 1988968494}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
@ -554,6 +555,76 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
--- !u!1 &1988968493
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1988968494}
- component: {fileID: 1988968495}
m_Layer: 5
m_Name: Video Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1988968494
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1988968493}
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: 1939570967}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 540, y: 960}
m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!328 &1988968495
VideoPlayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1988968493}
m_Enabled: 1
m_VideoClip: {fileID: 32900000, guid: bb47f2e1d816771489f860cbf3e8ae37, type: 3}
m_TargetCameraAlpha: 1
m_TargetCamera3DLayout: 0
m_TargetCamera: {fileID: 1302683601}
m_TargetTexture: {fileID: 0}
m_TimeReference: 0
m_TargetMaterialRenderer: {fileID: 0}
m_TargetMaterialProperty: <noninit>
m_RenderMode: 0
m_AspectRatio: 2
m_DataSource: 0
m_TimeUpdateMode: 2
m_PlaybackSpeed: 1
m_AudioOutputMode: 2
m_TargetAudioSources: []
m_DirectAudioVolumes: []
m_Url:
m_EnabledAudioTracks:
m_DirectAudioMutes:
m_ControlledAudioTrackCount: 0
m_PlayOnAwake: 1
m_SkipOnDrop: 1
m_Looping: 1
m_WaitForFirstFrame: 1
m_FrameReadyEventEnabled: 0
m_VideoShaders: []
--- !u!1660057539 &9223372036854775807 --- !u!1660057539 &9223372036854775807
SceneRoots: SceneRoots:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -0,0 +1,18 @@
namespace GadGame
{
public enum MusicDefine
{
BG,
}
public enum SoundDefine
{
Start,
TimeUp,
Result,
CollectStar,
GetHit,
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9da9df190b7ccbc4a81153f9f3be47f4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,49 @@
using System;
using Cysharp.Threading.Tasks;
using Pools.Runtime;
using UnityEngine;
namespace GadGame
{
public class AudioObject : MonoBehaviour, IPoolable
{
[SerializeField] private AudioSource _source;
private bool _alive;
private void Update()
{
if (_alive && !_source.isPlaying)
{
this.Release();
}
}
public void Play(AudioClip audioClip, float volume = 1, bool loop = false)
{
_source.clip = audioClip;
_source.volume = 1;
_source.loop = loop;
_source.Play();
_alive = true;
}
public void Stop()
{
_source.Stop();
}
public void OnGet()
{
_source.Stop();
_source.clip = null;
_source.loop = false;
}
public void OnRelease()
{
_alive = false;
_source.clip = null;
_source.loop = false;
}
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 13764e07dae44438af3c34c696585cde
timeCreated: 1713515540

View File

@ -0,0 +1,24 @@
using GadGame.SO;
using Sirenix.OdinInspector.Editor;
using UnityEditor;
namespace GadGame.Editor.Window
{
public class ConfigWindow : OdinMenuEditorWindow
{
[MenuItem("Game Config/Open Window")]
private static void ShowWindow()
{
GetWindow<ConfigWindow>().Show();
}
protected override OdinMenuTree BuildMenuTree()
{
var tree = new OdinMenuTree();
tree.Add("Scene Flow", SceneFlowConfig.GetOrCreateSettings());
tree.Add("Sound", AudioConfig.GetOrCreateSettings());
return tree;
}
}
}

View File

@ -1,21 +0,0 @@
using GadGame.SO;
using Sirenix.OdinInspector.Editor;
using Sirenix.Utilities;
using Sirenix.Utilities.Editor;
using UnityEditor;
using UnityEngine;
namespace GadGame.Editor.Window
{
public class SceneFlowConfigWindow : OdinEditorWindow
{
[MenuItem("Game Config/Scene Flow")]
private static void ShowWindow()
{
var window = InspectObject(SceneFlowConfig.GetOrCreateSettings());
window.position = GUIHelper.GetEditorWindowRect().AlignCenter(600, 200);
window.maxSize = new Vector2(600, 200);
window.minSize = new Vector2(600, 200);
}
}
}

View File

@ -1,7 +1,9 @@
using System; using System;
using GadGame.Manager;
using GadGame.SO; using GadGame.SO;
using GadGame.State; using GadGame.State;
using GadGame.State.MainFlowState; using GadGame.State.MainFlowState;
using Sirenix.OdinInspector;
namespace GadGame namespace GadGame
{ {

View File

@ -21,8 +21,8 @@ namespace GadGame.Manager
var asyncOperation = SceneManager.LoadSceneAsync(sceneIndex); var asyncOperation = SceneManager.LoadSceneAsync(sceneIndex);
asyncOperation.allowSceneActivation = false; asyncOperation.allowSceneActivation = false;
await UniTask.WaitUntil(() => asyncOperation.progress >= 0.9f); await UniTask.WaitUntil(() => asyncOperation.progress >= 0.9f);
await UniTask.Delay(200, ignoreTimeScale:true);
asyncOperation.allowSceneActivation = true; asyncOperation.allowSceneActivation = true;
await UniTask.Delay(200, ignoreTimeScale:true);
await _transitionCanvasGroup.DOFade(0, transitionDuration).SetUpdate(true);; await _transitionCanvasGroup.DOFade(0, transitionDuration).SetUpdate(true);;
} }
@ -32,8 +32,8 @@ namespace GadGame.Manager
var asyncOperation = SceneManager.LoadSceneAsync(sceneIndex); var asyncOperation = SceneManager.LoadSceneAsync(sceneIndex);
asyncOperation.allowSceneActivation = false; asyncOperation.allowSceneActivation = false;
await UniTask.WaitUntil(() => asyncOperation.progress >= 0.9f); await UniTask.WaitUntil(() => asyncOperation.progress >= 0.9f);
await UniTask.Delay(200, ignoreTimeScale:true);
asyncOperation.allowSceneActivation = true; asyncOperation.allowSceneActivation = true;
await UniTask.Delay(200, ignoreTimeScale:true);
await _transitionCanvasGroup.DOFade(0, transitionDuration/2).SetUpdate(true);; await _transitionCanvasGroup.DOFade(0, transitionDuration/2).SetUpdate(true);;
} }
@ -43,8 +43,8 @@ namespace GadGame.Manager
var asyncOperation = SceneManager.LoadSceneAsync(scenePath); var asyncOperation = SceneManager.LoadSceneAsync(scenePath);
asyncOperation.allowSceneActivation = false; asyncOperation.allowSceneActivation = false;
await UniTask.WaitUntil(() => asyncOperation.progress >= 0.9f); await UniTask.WaitUntil(() => asyncOperation.progress >= 0.9f);
await UniTask.Delay(200, ignoreTimeScale:true);
asyncOperation.allowSceneActivation = true; asyncOperation.allowSceneActivation = true;
await UniTask.Delay(200, ignoreTimeScale:true);
await _transitionCanvasGroup.DOFade(0, transitionDuration/2).SetUpdate(true);; await _transitionCanvasGroup.DOFade(0, transitionDuration/2).SetUpdate(true);;
} }
@ -54,8 +54,8 @@ namespace GadGame.Manager
var asyncOperation = SceneManager.LoadSceneAsync(scenePath); var asyncOperation = SceneManager.LoadSceneAsync(scenePath);
asyncOperation.allowSceneActivation = false; asyncOperation.allowSceneActivation = false;
await UniTask.WaitUntil(() => asyncOperation.progress >= 0.9f); await UniTask.WaitUntil(() => asyncOperation.progress >= 0.9f);
await UniTask.Delay(200, ignoreTimeScale:true);
asyncOperation.allowSceneActivation = true; asyncOperation.allowSceneActivation = true;
await UniTask.Delay(200, ignoreTimeScale:true);
await _transitionCanvasGroup.DOFade(0, transitionDuration/2).SetUpdate(true);; await _transitionCanvasGroup.DOFade(0, transitionDuration/2).SetUpdate(true);;
} }
} }

View File

@ -0,0 +1,49 @@
using GadGame.Singleton;
using GadGame.SO;
using Pools.Runtime;
using UnityEngine;
namespace GadGame.Manager
{
public class SoundManager : PersistentSingleton<SoundManager>
{
private Pool<AudioObject> _pool = new();
private AudioConfig _audioConfig;
private AudioSource _musicAudioSource;
protected override void Awake()
{
base.Awake();
_audioConfig = AudioConfig.FindSettings();
_musicAudioSource = gameObject.AddComponent<AudioSource>();
_musicAudioSource.playOnAwake = false;
_pool = new Pool<AudioObject>(_audioConfig.AudioObjectPrefab, 10, 1000);
}
public AudioObject PlaySfx(SoundDefine soundDefine, float volume = 1, bool loop = false)
{
var audioSource = _pool.Get();
audioSource.transform.SetParent(transform);
var audioClip = _audioConfig.Sounds[soundDefine.ToString()];
audioSource.Play(audioClip, volume, loop);
return audioSource;
}
public void PlayMusic(MusicDefine musicDefine, float volume = 1, bool loop = true)
{
_musicAudioSource.Stop();
var audioClip = _audioConfig.Musics[musicDefine.ToString()];
_musicAudioSource.clip = audioClip;
_musicAudioSource.volume = volume;
_musicAudioSource.loop = loop;
_musicAudioSource.Play();
}
public void StopMusic()
{
_musicAudioSource.Stop();
_musicAudioSource.clip = null;
_musicAudioSource.loop = false;
}
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: a39cd092c238463c8cb39c8391a043d4
timeCreated: 1713514371

View File

@ -4,8 +4,17 @@ namespace GadGame.MiniGame
{ {
public class Basket : MonoBehaviour public class Basket : MonoBehaviour
{ {
public bool Active;
public Vector3 Position
{
get => transform.position;
set => transform.position = value;
}
private void OnTriggerEnter2D(Collider2D other) private void OnTriggerEnter2D(Collider2D other)
{ {
if(!Active) return;
if (other.TryGetComponent(out ICollect item)) if (other.TryGetComponent(out ICollect item))
{ {
item.Collect(); item.Collect();

View File

@ -31,6 +31,7 @@ namespace GadGame.MiniGame
public void Collect() public void Collect()
{ {
GameManager.Instance.UpdateScore(-_reduceScore); GameManager.Instance.UpdateScore(-_reduceScore);
SoundManager.Instance.PlaySfx(SoundDefine.GetHit);
this.Release(); this.Release();
} }

View File

@ -30,6 +30,7 @@ namespace GadGame.MiniGame
public void Collect() public void Collect()
{ {
GameManager.Instance.UpdateScore(_score); GameManager.Instance.UpdateScore(_score);
SoundManager.Instance.PlaySfx(SoundDefine.CollectStar);
this.Release(); this.Release();
} }

View File

@ -1,3 +1,4 @@
using System;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using DG.Tweening; using DG.Tweening;
using GadGame.Manager; using GadGame.Manager;
@ -8,6 +9,7 @@ using Pools.Runtime;
using Sirenix.OdinInspector; using Sirenix.OdinInspector;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using Random = UnityEngine.Random;
namespace GadGame.MiniGame namespace GadGame.MiniGame
{ {
@ -15,7 +17,7 @@ namespace GadGame.MiniGame
{ {
[Header("Stats")] [Header("Stats")]
public int GameTime; public int GameTime;
[SerializeField] private Transform _basket; [SerializeField] private Basket _basket;
[SerializeField] private float _lerp; [SerializeField] private float _lerp;
[SerializeField] private float _spawnTime; [SerializeField] private float _spawnTime;
[SerializeField, Range(0,1)] private float _bombChange; [SerializeField, Range(0,1)] private float _bombChange;
@ -43,6 +45,7 @@ namespace GadGame.MiniGame
private GameManager _gameManager; private GameManager _gameManager;
private Camera _camera; private Camera _camera;
private float _spawnTimer; private float _spawnTimer;
private Vector3 _preFramePosition;
private void Start() private void Start()
{ {
@ -52,9 +55,15 @@ namespace GadGame.MiniGame
_gameManager.OnScoreUpdate += OnScoreUpdate; _gameManager.OnScoreUpdate += OnScoreUpdate;
_camera = Camera.main; _camera = Camera.main;
_time.text = GameTime.ToString(); _time.text = GameTime.ToString();
SoundManager.Instance.PlayMusic(MusicDefine.BG);
SetState<TutorialGameState>(); SetState<TutorialGameState>();
} }
private void LateUpdate()
{
_preFramePosition = _basket.Position;
}
public void SpawnRandomItem() public void SpawnRandomItem()
{ {
_spawnTimer += Time.deltaTime; _spawnTimer += Time.deltaTime;
@ -94,13 +103,15 @@ namespace GadGame.MiniGame
{ {
var mousePos = input; var mousePos = input;
var pos = _camera.ScreenToWorldPoint(mousePos); var pos = _camera.ScreenToWorldPoint(mousePos);
var currentPosition = _basket.position; var currentPosition = _basket.Position;
pos.x *= -1; pos.x *= -1;
pos.y = currentPosition.y; pos.y = currentPosition.y;
pos.z = 0; pos.z = 0;
currentPosition= Vector3.Lerp(currentPosition, pos, _lerp * Time.deltaTime); currentPosition= Vector3.Lerp(currentPosition, pos, _lerp * Time.deltaTime);
currentPosition.x = Mathf.Clamp(currentPosition.x, -2.25f, 2.25f); currentPosition.x = Mathf.Clamp(currentPosition.x, -2.25f, 2.25f);
_basket.position = currentPosition; var dirMove = (_preFramePosition - currentPosition).normalized;
_basket.transform.DORotate(new Vector3(0, 0, 10 * dirMove.x), 0.2f);
_basket.Position = currentPosition;
} }
} }
@ -114,9 +125,9 @@ namespace GadGame.MiniGame
await _thisYou.DOScale(Vector3.one, 0.2f); await _thisYou.DOScale(Vector3.one, 0.2f);
await UniTask.Delay(2000); await UniTask.Delay(2000);
await _right.DOScale(Vector3.one, 0.2f).OnStart(()=> _thisYou.DOScale(Vector3.zero, 0.2f)); await _right.DOScale(Vector3.one, 0.2f).OnStart(()=> _thisYou.DOScale(Vector3.zero, 0.2f));
await UniTask.WaitUntil(() => _basket.position.x >= 1.5f); await UniTask.WaitUntil(() => _basket.Position.x >= 1.5f);
await _left.DOScale(Vector3.one, 0.2f).OnStart(()=> _right.DOScale(Vector3.zero, 0.2f)); await _left.DOScale(Vector3.one, 0.2f).OnStart(()=> _right.DOScale(Vector3.zero, 0.2f));
await UniTask.WaitUntil(() => _basket.position.x <= -1.5f); await UniTask.WaitUntil(() => _basket.Position.x <= -1.5f);
await _left.DOScale(Vector3.zero, 0.2f); await _left.DOScale(Vector3.zero, 0.2f);
await _end.DOScale(Vector3.one, 0.2f); await _end.DOScale(Vector3.one, 0.2f);
await UniTask.Delay(2000); await UniTask.Delay(2000);
@ -131,9 +142,9 @@ namespace GadGame.MiniGame
await _resultScore.DOText(_gameManager.Score.ToString(), 1f, scrambleMode: ScrambleMode.Numerals); await _resultScore.DOText(_gameManager.Score.ToString(), 1f, scrambleMode: ScrambleMode.Numerals);
} }
public void DisableBasket() public void SetActive(bool value)
{ {
_basket.GetComponent<Basket>().enabled = false; _basket.Active = value;
} }
public void SetTextTime(float time) public void SetTextTime(float time)
@ -145,6 +156,7 @@ namespace GadGame.MiniGame
{ {
_gameManager.OnPause -= Pause; _gameManager.OnPause -= Pause;
_gameManager.OnResume -= Resume; _gameManager.OnResume -= Resume;
SoundManager.Instance.StopMusic();
} }
[Button, HideInEditorMode] [Button, HideInEditorMode]

View File

@ -0,0 +1,82 @@
using System.Collections.Generic;
using System.Linq;
using Sirenix.OdinInspector;
using UnityEngine;
#if UNITY_EDITOR
using System.IO;
using UnityEditor;
#endif
namespace GadGame.SO
{
[CreateAssetMenu]
public class AudioConfig : SerializedScriptableObject
{
public AudioObject AudioObjectPrefab;
[SerializeField]
[FolderPath(RequireExistingPath = true, ParentFolder = "Assets")]
private string _soundDefineFileSavePath;
public Dictionary<string, AudioClip> Musics = new();
public Dictionary<string, AudioClip> Sounds = new();
[Button(ButtonSizes.Gigantic), GUIColor(0, 1, 0)]
private void GenerateAudioDefine()
{
var backgroundMusicBody = "";
backgroundMusicBody = Musics.Aggregate(backgroundMusicBody, (current, music) => current + $"\t\t{music.Key},\n");
var soundEffectsBody = "";
soundEffectsBody = Sounds.Aggregate(soundEffectsBody, (current, music) => current + $"\t\t{music.Key},\n");
var ns = _soundDefineFileSavePath.Replace('/', '.').Replace(".Scripts", "");
var template = Utils.GetTemplate("AudioDefine", new Dictionary<string, string>
{
{"backgroundMusicBody", backgroundMusicBody},
{"soundEffectsBody", soundEffectsBody},
{"namespace", ns}
});
using (var sw = new StreamWriter(Path.Combine(Application.dataPath, _soundDefineFileSavePath,$"AudioDefine.cs")))
{
sw.Write (template);
}
AssetDatabase.Refresh (ImportAssetOptions.ForceUpdate);
}
#if UNITY_EDITOR
public static AudioConfig FindSettings()
{
var guids = AssetDatabase.FindAssets($"t:{nameof(AudioConfig)}");
if (guids.Length > 1) Debug.LogWarning("Found multiple settings files, using the first.");
switch (guids.Length)
{
case 0:
return null;
default:
var path = AssetDatabase.GUIDToAssetPath(guids[0]);
return AssetDatabase.LoadAssetAtPath<AudioConfig>(path);
}
}
public static AudioConfig GetOrCreateSettings()
{
var settings = FindSettings();
if (settings == null)
{
settings = CreateInstance<AudioConfig>();
string path = "Assets/GadGame/SO/SoundConfig";
if (!Directory.Exists(path)) Directory.CreateDirectory(path);
AssetDatabase.CreateAsset(settings, $"{path}/Sound Config.asset");
AssetDatabase.SaveAssets();
}
return settings;
}
#endif
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4968dbf204c349aba96b27b0dedc9c34
timeCreated: 1713511059

View File

@ -1,6 +1,8 @@
using UnityEngine;
#if UNITY_EDITOR
using System.IO; using System.IO;
using UnityEditor; using UnityEditor;
using UnityEngine; #endif
namespace GadGame.SO namespace GadGame.SO
{ {
@ -12,7 +14,6 @@ namespace GadGame.SO
public SceneReference ViewedScene; public SceneReference ViewedScene;
public SceneReference EndGageScene; public SceneReference EndGageScene;
public SceneReference GameScene; public SceneReference GameScene;
public SceneReference RewardScene;
public SceneReference CTAScene; public SceneReference CTAScene;
@ -38,7 +39,7 @@ namespace GadGame.SO
if (settings == null) if (settings == null)
{ {
settings = CreateInstance<SceneFlowConfig>(); settings = CreateInstance<SceneFlowConfig>();
string path = "Assets/_Game/SO/SceneFlowConfig"; string path = "Assets/GadGame/SO/SceneFlowConfig";
if (!Directory.Exists(path)) Directory.CreateDirectory(path); if (!Directory.Exists(path)) Directory.CreateDirectory(path);
AssetDatabase.CreateAsset(settings, $"{path}/Scene Flow Config.asset"); AssetDatabase.CreateAsset(settings, $"{path}/Scene Flow Config.asset");
AssetDatabase.SaveAssets(); AssetDatabase.SaveAssets();

View File

@ -10,7 +10,7 @@ namespace GadGame.State.GameState
public override async void Enter() public override async void Enter()
{ {
Debug.Log("End Game"); Debug.Log("End Game");
Runner.DisableBasket(); Runner.SetActive(false);
await UniTask.Delay(1000); await UniTask.Delay(1000);
Runner.ShowResult(); Runner.ShowResult();
await UniTask.Delay(4000); await UniTask.Delay(4000);

View File

@ -10,6 +10,7 @@ namespace GadGame.State.GameState
public override void Enter() public override void Enter()
{ {
Debug.Log("Playing Game"); Debug.Log("Playing Game");
Runner.SetActive(true);
} }
public override void Update(float time) public override void Update(float time)

View File

@ -6,7 +6,6 @@ namespace GadGame.State.MainFlowState
{ {
public class CTAState : State<MainFlow> public class CTAState : State<MainFlow>
{ {
private float _noPassByTimer;
public override void Enter() public override void Enter()
{ {
LoadSceneManager.Instance.LoadSceneWithTransition(Runner.SceneFlowConfig.CTAScene.ScenePath); LoadSceneManager.Instance.LoadSceneWithTransition(Runner.SceneFlowConfig.CTAScene.ScenePath);
@ -14,10 +13,7 @@ namespace GadGame.State.MainFlowState
public override void Update(float time) public override void Update(float time)
{ {
if (!UdpSocket.Instance.DataReceived.PassBy) if (time >= 10)
{
_noPassByTimer += Time.deltaTime;
if (_noPassByTimer >= 5)
{ {
if(!UdpSocket.Instance.DataReceived.PassBy) if(!UdpSocket.Instance.DataReceived.PassBy)
{ {
@ -37,15 +33,10 @@ namespace GadGame.State.MainFlowState
Runner.SetState<EngageState>(); Runner.SetState<EngageState>();
} }
} }
else
{
_noPassByTimer = 0;
}
}
public override void Exit() public override void Exit()
{ {
_noPassByTimer = 0;
} }
} }
} }

View File

@ -13,7 +13,7 @@ namespace GadGame.State.MainFlowState
public override void Enter() public override void Enter()
{ {
LoadSceneManager.Instance.LoadSceneWithTransition(Runner.SceneFlowConfig.EndGageScene.ScenePath); LoadSceneManager.Instance.LoadSceneWithTransition(Runner.SceneFlowConfig.EndGageScene.ScenePath);
_readyTimer = 3; _readyTimer = 5;
} }
public override void Update(float time) public override void Update(float time)
@ -35,9 +35,6 @@ namespace GadGame.State.MainFlowState
break; break;
} }
}
switch (_showCountDown) switch (_showCountDown)
{ {
case false when UdpSocket.Instance.DataReceived.Ready: case false when UdpSocket.Instance.DataReceived.Ready:
@ -60,6 +57,8 @@ namespace GadGame.State.MainFlowState
Runner.ReadyCountDown(_readyTimer); Runner.ReadyCountDown(_readyTimer);
} }
}
public override void Exit() public override void Exit()
{ {
_warned = false; _warned = false;

View File

@ -46,11 +46,12 @@ namespace GadGame.State.MainFlowState
public override void Exit() public override void Exit()
{ {
_warned = false; _warned = false;
_gameManager.OnEnd -= OnEndGame;
} }
private void OnEndGame() private void OnEndGame()
{ {
Runner.SetState<RewardState>(); Runner.SetState<CTAState>();
} }
private void OnWaringComplete() private void OnWaringComplete()

View File

@ -1,27 +0,0 @@
using GadGame.Manager;
namespace GadGame.State.MainFlowState
{
public class RewardState : State<MainFlow>
{
public override void Enter()
{
LoadSceneManager.Instance.LoadSceneWithTransition(Runner.SceneFlowConfig.RewardScene.ScenePath);
}
public override void Update(float time)
{
if (time >= 5)
{
Runner.SetState<CTAState>();
}
}
public override void Exit()
{
}
}
}

View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 85c368940c2d4ccf9ce95a997dd5c0f7
timeCreated: 1712818790

View File

@ -1,3 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using UnityEngine; using UnityEngine;
namespace GadGame namespace GadGame
@ -10,5 +12,14 @@ namespace GadGame
var bottomLeft = rect.position + new Vector2(-rect.width / 2, -rect.height / 2); var bottomLeft = rect.position + new Vector2(-rect.width / 2, -rect.height / 2);
return bottomLeft + new Vector2(Random.Range(0, rectSize.x), Random.Range(0, rectSize.y)); return bottomLeft + new Vector2(Random.Range(0, rectSize.x), Random.Range(0, rectSize.y));
} }
public static string GetTemplate(string templateName, Dictionary<string, string> arguments)
{
var filePath = $"Templates/{templateName}";
var textAsset = Resources.Load<TextAsset>(filePath);
var template = textAsset.text;
Resources.UnloadAsset(textAsset);
return arguments.Aggregate(template, (current, argument) => current.Replace($"$[{argument.Key}]", argument.Value));
}
} }
} }

View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 2048 maxTextureSize: 1024
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 1
@ -106,6 +106,32 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: f3f45ffad0a0f724fa5e3f96c5abfb07
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: f72252719cb7b834ab35bbf09a624bb1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 918798f573803bf4a9bacafbfa817d99
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 2875503082f45194cb9f4d7ad3db3174
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

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

Binary file not shown.

View File

@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: 99ea5be85f0eb0244a76574702d66fa4
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,27 @@
fileFormatVersion: 2
guid: 4989e7f639a1abc44b2aa49494c35025
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings:
0:
enableTranscoding: 0
codec: 0
resizeFormat: 0
aspectRatio: 0
customWidth: 500
customHeight: 1000
bitrateMode: 2
spatialQuality: 2
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: 20e43a7fab8ea014b98805750625d186
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: bb47f2e1d816771489f860cbf3e8ae37
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@ -0,0 +1,12 @@
namespace $[namespace]
{
public enum MusicDefine
{
$[backgroundMusicBody]
}
public enum SoundDefine
{
$[soundEffectsBody]
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d396a3c2d52ede9448d10507de22f461
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -9,24 +9,21 @@ EditorBuildSettings:
path: Assets/GadGame/Scenes/Main.unity path: Assets/GadGame/Scenes/Main.unity
guid: 9fc0d4010bbf28b4594072e72b8655ab guid: 9fc0d4010bbf28b4594072e72b8655ab
- enabled: 1 - enabled: 1
path: Assets/GadGame/Scenes/Scene 1.unity path: Assets/GadGame/Scenes/Idle.unity
guid: 632910d4b45f36a478868b8cdc4b3ec2 guid: 632910d4b45f36a478868b8cdc4b3ec2
- enabled: 1 - enabled: 1
path: Assets/GadGame/Scenes/Scene 2.unity path: Assets/GadGame/Scenes/PassBy.unity
guid: c9e32be920223db4eb26536f66c3d91a guid: c9e32be920223db4eb26536f66c3d91a
- enabled: 1 - enabled: 1
path: Assets/GadGame/Scenes/Scene 3.unity path: Assets/GadGame/Scenes/Viewer.unity
guid: f55162ea91535d84290df33ce2b3c2fb guid: f55162ea91535d84290df33ce2b3c2fb
- enabled: 1 - enabled: 1
path: Assets/GadGame/Scenes/Scene 4.unity path: Assets/GadGame/Scenes/Engage.unity
guid: cdaaa0ee6b3b73b4b9f984ca2bf1d535 guid: cdaaa0ee6b3b73b4b9f984ca2bf1d535
- enabled: 1 - enabled: 1
path: Assets/GadGame/Scenes/Scene 5.unity path: Assets/GadGame/Scenes/Game.unity
guid: 79d05a23a33b9504c8ae8344c73927fe guid: 79d05a23a33b9504c8ae8344c73927fe
- enabled: 1 - enabled: 1
path: Assets/GadGame/Scenes/Scene 6.unity path: Assets/GadGame/Scenes/CTA.unity
guid: 2b401697cdf0bc04fa20a817815f9e83
- enabled: 1
path: Assets/GadGame/Scenes/Scene 7.unity
guid: 46cab2f289b2fed4bb929899e3c5cf4b guid: 46cab2f289b2fed4bb929899e3c5cf4b
m_configObjects: {} m_configObjects: {}