prod 1
This commit is contained in:
28727
Assets/Game/Prefabs/Minigame/PlaneBlast.prefab
Normal file
28727
Assets/Game/Prefabs/Minigame/PlaneBlast.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Game/Prefabs/Minigame/PlaneBlast.prefab.meta
Normal file
7
Assets/Game/Prefabs/Minigame/PlaneBlast.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e589aa1604021b34fb85d937ec41f47a
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9635,7 +9635,7 @@ AudioSource:
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 8300000, guid: 239823c0b628b0945a9d4d749be13794, type: 3}
|
||||
m_audioClip: {fileID: 8300000, guid: fb43302325a39f042a2e5af46c0fb23a, type: 3}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 0.85
|
||||
m_Pitch: 0.85
|
||||
|
||||
@@ -119,3 +119,4 @@ MonoBehaviour:
|
||||
radius: 1.812
|
||||
gizmoColor: {r: 0, g: 1, b: 0, a: 1}
|
||||
active: 1
|
||||
PickupEffect: {fileID: 6600959250872966517, guid: e176a56c1fdc3ea40b61205eab33aabb, type: 3}
|
||||
|
||||
BIN
Assets/Game/SFX/new/Explosion - Copy.wav
Normal file
BIN
Assets/Game/SFX/new/Explosion - Copy.wav
Normal file
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e1c26f9a64d162341981c7318c563f1c
|
||||
guid: ed0651c697387e849b3e1e249da6bae1
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
BIN
Assets/Game/SFX/new/Explosion.wav
Normal file
BIN
Assets/Game/SFX/new/Explosion.wav
Normal file
Binary file not shown.
22
Assets/Game/SFX/new/Explosion.wav.meta
Normal file
22
Assets/Game/SFX/new/Explosion.wav.meta
Normal file
@@ -0,0 +1,22 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fb43302325a39f042a2e5af46c0fb23a
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Binary file not shown.
BIN
Assets/Game/SFX/new/spaceship_engine_loop.mp3
Normal file
BIN
Assets/Game/SFX/new/spaceship_engine_loop.mp3
Normal file
Binary file not shown.
22
Assets/Game/SFX/new/spaceship_engine_loop.mp3.meta
Normal file
22
Assets/Game/SFX/new/spaceship_engine_loop.mp3.meta
Normal file
@@ -0,0 +1,22 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44d0fa568b02acc4ba98aaf706e57bf7
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@@ -548,7 +548,7 @@ RectTransform:
|
||||
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_AnchoredPosition: {x: 560.156, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &351774797
|
||||
@@ -1983,8 +1983,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -649.3976}
|
||||
m_SizeDelta: {x: 971, y: 970}
|
||||
m_AnchoredPosition: {x: 0.010956, y: -715.90247}
|
||||
m_SizeDelta: {x: 1120.3, y: 528.235}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1356538174
|
||||
MonoBehaviour:
|
||||
@@ -1999,7 +1999,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 728fa64fe6dd24aa5ae13b1da2514961, type: 2}
|
||||
m_Color: {r: 0.9198113, g: 0.98496586, b: 1, a: 0.09803922}
|
||||
m_Color: {r: 0.9198113, g: 0.98496586, b: 1, a: 0.019607844}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@@ -3617,6 +3617,10 @@ PrefabInstance:
|
||||
propertyPath: starCollected
|
||||
value:
|
||||
objectReference: {fileID: 8300000, guid: 331b24a634b985e4eb24c5bbddfcf08f, type: 3}
|
||||
- target: {fileID: 4756257046900231692, guid: 27ddde4075d406442bd20457ba93d69d, type: 3}
|
||||
propertyPath: chestOpenRiser
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4756257046900231692, guid: 27ddde4075d406442bd20457ba93d69d, type: 3}
|
||||
propertyPath: minigameFailed
|
||||
value:
|
||||
@@ -3637,6 +3641,10 @@ PrefabInstance:
|
||||
propertyPath: bpOpen.Array.size
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4756257046900231692, guid: 27ddde4075d406442bd20457ba93d69d, type: 3}
|
||||
propertyPath: confettiExplosion
|
||||
value:
|
||||
objectReference: {fileID: 8300000, guid: 2dcd5da12751d034bb710af85ad18450, type: 3}
|
||||
- target: {fileID: 4756257046900231692, guid: 27ddde4075d406442bd20457ba93d69d, type: 3}
|
||||
propertyPath: musics.Array.size
|
||||
value: 3
|
||||
|
||||
9776
Assets/Game/Scenes/GameScene/SparkleAreaWhite.prefab
Normal file
9776
Assets/Game/Scenes/GameScene/SparkleAreaWhite.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fe5e01438a49b3d4d9164ab9838c0e98
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
4836
Assets/Game/Scenes/MagicDust.prefab
Normal file
4836
Assets/Game/Scenes/MagicDust.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Game/Scenes/MagicDust.prefab.meta
Normal file
7
Assets/Game/Scenes/MagicDust.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1e1476e8994a8ae49914999abfaf0521
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -7194,6 +7194,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 950
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4164082910810650888, guid: ac77354e7ae84d84e8eca6e8dcadfbe8, type: 3}
|
||||
propertyPath: HapticToggle
|
||||
value:
|
||||
objectReference: {fileID: 2004813633}
|
||||
- target: {fileID: 4164082910810650888, guid: ac77354e7ae84d84e8eca6e8dcadfbe8, type: 3}
|
||||
propertyPath: OnChanged.m_PersistentCalls.m_Calls.Array.size
|
||||
value: 1
|
||||
@@ -7326,6 +7330,11 @@ GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4164082910810650891, guid: ac77354e7ae84d84e8eca6e8dcadfbe8, type: 3}
|
||||
m_PrefabInstance: {fileID: 773470068}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &773470071 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4164082909584456986, guid: ac77354e7ae84d84e8eca6e8dcadfbe8, type: 3}
|
||||
m_PrefabInstance: {fileID: 773470068}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &799128814
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -8173,19 +8182,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@@ -8193,7 +8202,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 131.879
|
||||
value: 131.87903
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -8225,11 +8234,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 1111.0001
|
||||
value: 102.00012
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -917
|
||||
value: 131
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3901737671544378619, guid: fd6f0d38a3ce6954aaf3fd2ace269234, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@@ -10548,19 +10557,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@@ -10568,7 +10577,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 131.879
|
||||
value: 131.87903
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -10600,11 +10609,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 893
|
||||
value: -116
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -917
|
||||
value: 131
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2090662561714647924, guid: 73cec45d673e41b45a3bc95f551a0769, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@@ -10996,6 +11005,114 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1970618582}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1001 &2004813632
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 773470071}
|
||||
m_Modifications:
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 84
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 84
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 201.8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 149.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694924, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 240801179202694925, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Toggle_RememberMe
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
--- !u!114 &2004813633 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 240801179202694961, guid: 4fbbafd29c9af144bb1a06646fd61aba, type: 3}
|
||||
m_PrefabInstance: {fileID: 2004813632}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &2058016605
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -13022,6 +13139,18 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
- m_Target: {fileID: 332697608}
|
||||
m_TargetAssemblyTypeName: SceneDataHolder, Assembly-CSharp
|
||||
m_MethodName: ShowAd
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
--- !u!1 &5001849302241710807
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
337
Assets/Game/Scenes/Minigame/Toggle_RememberMe.prefab
Normal file
337
Assets/Game/Scenes/Minigame/Toggle_RememberMe.prefab
Normal file
@@ -0,0 +1,337 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &240801179202694925
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 240801179202694924}
|
||||
- component: {fileID: 240801179202694926}
|
||||
- component: {fileID: 240801179202694927}
|
||||
- component: {fileID: 240801179202694961}
|
||||
m_Layer: 5
|
||||
m_Name: Toggle_RememberMe
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &240801179202694924
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240801179202694925}
|
||||
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_Children:
|
||||
- {fileID: 240801180606633992}
|
||||
- {fileID: 240801181050238447}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 201.8, y: 149.1}
|
||||
m_SizeDelta: {x: 84, y: 84}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &240801179202694926
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240801179202694925}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &240801179202694927
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240801179202694925}
|
||||
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: 1, g: 1, b: 1, a: 1}
|
||||
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: 21300000, guid: aa09dddc7c5f24d0983e3a6958f80a1c, type: 3}
|
||||
m_Type: 0
|
||||
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!114 &240801179202694961
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240801179202694925}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 240801179202694927}
|
||||
toggleTransition: 1
|
||||
graphic: {fileID: 240801180606633995}
|
||||
m_Group: {fileID: 0}
|
||||
onValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_IsOn: 1
|
||||
--- !u!1 &240801180606633993
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 240801180606633992}
|
||||
- component: {fileID: 240801180606633994}
|
||||
- component: {fileID: 240801180606633995}
|
||||
m_Layer: 5
|
||||
m_Name: Icon_Check
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &240801180606633992
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240801180606633993}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 240801179202694924}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 84, y: 84}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &240801180606633994
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240801180606633993}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &240801180606633995
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240801180606633993}
|
||||
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: 1, g: 1, b: 1, a: 1}
|
||||
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: 21300000, guid: 558e1d0ef6ee24fee80dbf641857e8dc, type: 3}
|
||||
m_Type: 0
|
||||
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!1 &240801181050238444
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 240801181050238447}
|
||||
- component: {fileID: 240801181050238225}
|
||||
- component: {fileID: 240801181050238446}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Me
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &240801181050238447
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240801181050238444}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 240801179202694924}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 285.4, y: 2.3999996}
|
||||
m_SizeDelta: {x: 428.4, y: 102.20392}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &240801181050238225
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240801181050238444}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &240801181050238446
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240801181050238444}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Vibration
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
|
||||
m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 40
|
||||
m_fontSizeBase: 40
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: -0.62
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 1
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4fbbafd29c9af144bb1a06646fd61aba
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -67,8 +67,8 @@ public class AdsManager : MonoBehaviour
|
||||
}
|
||||
|
||||
private static UnityEvent onInterestitialClosed = new UnityEvent();
|
||||
public static void AddOnInterestitialClosed(UnityAction e){
|
||||
if(onInterestitialClosed==null){onInterestitialClosed = new UnityEvent();}
|
||||
public static void SetOnInterestitialClosed(UnityAction e){
|
||||
onInterestitialClosed = new UnityEvent();
|
||||
|
||||
onInterestitialClosed.AddListener(e);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
|
||||
[RequireComponent(typeof(AudioSource))]
|
||||
@@ -26,6 +27,8 @@ public class AudioManager : MonoBehaviour
|
||||
[SerializeField]private AudioClip bpFound;
|
||||
[SerializeField]private AudioClip reward;
|
||||
[SerializeField]private AudioClip gemsCollect;
|
||||
[SerializeField]private AudioClip confettiExplosion;
|
||||
|
||||
|
||||
[Header("Gold")]
|
||||
public AudioClip collectGoldBegin;
|
||||
@@ -191,13 +194,17 @@ public class AudioManager : MonoBehaviour
|
||||
audioSrc.PlayOneShot(minigameDied);
|
||||
}
|
||||
|
||||
public void ConfettiExplosion(){
|
||||
audioSrc.PlayOneShot(confettiExplosion);
|
||||
}
|
||||
|
||||
public void TypeWriter(){
|
||||
audioSrc.PlayOneShot(typewriters[Random.Range(0, typewriters.Length)],0.1f);
|
||||
}
|
||||
|
||||
public void CollectGold(int amount){
|
||||
public async void CollectGold(int amount){
|
||||
audioSrc.PlayOneShot(collectGoldBegin);
|
||||
|
||||
await Task.Delay(300);
|
||||
// int index = Mathf.Clamp((Mathf.Clamp(amount,0,100) / 100) * collectGoldArray.Length,0,collectGoldArray.Length-1);
|
||||
int index =0;
|
||||
if(amount < 10){
|
||||
|
||||
@@ -28,11 +28,7 @@ public class ChestOpener : MonoBehaviour
|
||||
}
|
||||
|
||||
public async void OpenChest(ChestDataObject chestData){
|
||||
if(chestData == EpicChestData){
|
||||
AudioManager.instnace.EpicChestOpen();
|
||||
}else{
|
||||
AudioManager.instnace.ChestOpen();
|
||||
}
|
||||
|
||||
chestOpenPopup.SetActive(true);
|
||||
okButton.SetActive(false);
|
||||
|
||||
@@ -103,11 +99,13 @@ public class ChestOpener : MonoBehaviour
|
||||
|
||||
//Chest opens here
|
||||
confettiFX.Play();
|
||||
StartCoroutine(PlaySFX(chestData == EpicChestData));
|
||||
Debug.Log("Chest opening");
|
||||
while (chestAnim.GetCurrentAnimatorStateInfo(0).IsName("openAnim")){
|
||||
await Task.Delay(10);
|
||||
}
|
||||
|
||||
|
||||
Debug.Log("Chest opened");
|
||||
|
||||
DBmanager.SetGems(DBmanager.Gems + gemsCount);
|
||||
DBmanager.SetCoins(DBmanager.Coins + goldCount);
|
||||
|
||||
@@ -119,4 +117,17 @@ public class ChestOpener : MonoBehaviour
|
||||
okButton.SetActive(true);
|
||||
|
||||
}
|
||||
|
||||
IEnumerator PlaySFX(bool isEpic){
|
||||
yield return new WaitForSeconds(1f);
|
||||
|
||||
if(isEpic){
|
||||
AudioManager.instnace.EpicChestOpen();
|
||||
}else{
|
||||
AudioManager.instnace.ChestOpen();
|
||||
}
|
||||
yield return new WaitForSeconds(0.8f);
|
||||
confettiFX.GetComponent<AudioSource>().Play();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,17 +6,26 @@ using UnityEngine.Events;
|
||||
public class ControlSettings : MonoBehaviour
|
||||
{
|
||||
private const string ControlOnRightKey = "ControlOnRight";
|
||||
private const string HapticKey = "ControlOnRight";
|
||||
public Button left;
|
||||
public Button right;
|
||||
public Toggle HapticToggle;
|
||||
public static bool ControlIsOnRight = true;
|
||||
public static bool HapticEnabled = true;
|
||||
public UnityEvent OnChanged;
|
||||
void Awake()
|
||||
{
|
||||
if(PlayerPrefs.HasKey(ControlOnRightKey)){
|
||||
ControlIsOnRight = PlayerPrefs.GetInt(ControlOnRightKey) == 1;
|
||||
}
|
||||
if(PlayerPrefs.HasKey(HapticKey)){
|
||||
HapticEnabled = PlayerPrefs.GetInt(HapticKey) == 1;
|
||||
}
|
||||
|
||||
left.onClick.AddListener(()=>{ChangeControlSide(true);});
|
||||
right.onClick.AddListener(()=>{ChangeControlSide(false);});
|
||||
|
||||
HapticToggle.onValueChanged.AddListener(ToggleHaptic);
|
||||
UpdateSettingsPage();
|
||||
}
|
||||
|
||||
@@ -25,12 +34,21 @@ public class ControlSettings : MonoBehaviour
|
||||
PlayerPrefs.SetInt(ControlOnRightKey, value? 1: 0);
|
||||
PlayerPrefs.Save();
|
||||
UpdateSettingsPage();
|
||||
AudioManager.instnace.UIClick();
|
||||
OnChanged.Invoke();
|
||||
|
||||
AudioManager.instnace.UIClick();
|
||||
}
|
||||
|
||||
public void ToggleHaptic(bool value){
|
||||
PlayerPrefs.SetInt(HapticKey, value ? 1 : 0);
|
||||
PlayerPrefs.Save();
|
||||
|
||||
HapticEnabled = value;
|
||||
}
|
||||
|
||||
void UpdateSettingsPage(){
|
||||
left.transform.GetChild(0).GetComponent<Image>().color = (!ControlIsOnRight) ? Color.blue : Color.green;
|
||||
right.transform.GetChild(0).GetComponent<Image>().color = (ControlIsOnRight) ? Color.blue : Color.green;
|
||||
HapticToggle.isOn = HapticEnabled;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -197,9 +197,10 @@ public class DesignLab : MonoBehaviour
|
||||
if(DBmanager.Metal < boxPrices[selectedBoxIndex]){
|
||||
MessageDialog.instance.ShowMessage("Error", "Not enough energy to open this box");
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
DBmanager.SetMetal(DBmanager.Metal-boxPrices[selectedBoxIndex]);
|
||||
|
||||
AudioManager.instnace.OpenBP();
|
||||
newBoxPanel.SetActive(true);
|
||||
string rarityName = "Common";
|
||||
@@ -253,6 +254,7 @@ public class DesignLab : MonoBehaviour
|
||||
//UpgradeEffect.top_instance.Show(newSkinPanel.GetComponent<RectTransform>().position);
|
||||
|
||||
DBmanager.AddSkinBlueprint(skin);
|
||||
AudioManager.instnace.ConfettiExplosion();
|
||||
|
||||
//Fullscreen FX
|
||||
foreach (ParticleSystem particle in fullscreenFX)
|
||||
@@ -268,6 +270,8 @@ public class DesignLab : MonoBehaviour
|
||||
// UpgradeEffect.top_instance.Show(goldsPanel.GetComponent<RectTransform>().position);
|
||||
//Confetti
|
||||
confettiFX.Play();
|
||||
AudioManager.instnace.ConfettiExplosion();
|
||||
|
||||
DBmanager.SetCoins(DBmanager.Coins + amount);
|
||||
Refresh();
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ using UnityEngine.SceneManagement;
|
||||
|
||||
public class MaintainceChecker : MonoBehaviour
|
||||
{
|
||||
public static int version = 24;
|
||||
public static int version = 31;
|
||||
public static MaintainceChecker instance;
|
||||
public int checkInterval = 30;
|
||||
float t;
|
||||
|
||||
@@ -13,7 +13,7 @@ public class CameraFollower : MonoBehaviour
|
||||
public float smoothness = 0.1f;
|
||||
public CameraUpdateMode updateMode;
|
||||
public static CameraFollower instance{get; private set;}
|
||||
public static void UpdateFrame()=> instance.HandleFrame();
|
||||
public static void UpdateFrame() {if(instance.updateMode == CameraUpdateMode.Manual){ instance.HandleFrame();}}
|
||||
void Awake(){
|
||||
instance=this;
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ public class KillfeedMgr : MonoBehaviour
|
||||
}
|
||||
|
||||
public void AddNewEntry(string message){
|
||||
return;
|
||||
for(int i =0; i < pool.Count; i++){
|
||||
if(!pool[i].gameObject.activeSelf){
|
||||
pool[i].SetEntry(message,entryAliveTime);
|
||||
|
||||
@@ -37,6 +37,10 @@ public class MinigameManager : NetworkBehaviour
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
defaultJoyPos = joystick.transform.GetChild(0).GetComponent<RectTransform>().localPosition;
|
||||
|
||||
SwitchUISides();
|
||||
|
||||
// if(!DBmanager.LoggedIn){SceneManager.LoadScene(0);}
|
||||
SceneData.GameManager = this;
|
||||
instance = this;
|
||||
@@ -46,33 +50,62 @@ public class MinigameManager : NetworkBehaviour
|
||||
|
||||
safeZoneShrinkSpeed = mapRadius / safeZoneShrinkTime;
|
||||
|
||||
defaultJoyPos = joystick.transform.GetChild(0).GetComponent<RectTransform>().localPosition;
|
||||
SwitchUISides();
|
||||
|
||||
|
||||
}
|
||||
Vector2 defaultJoyPos;
|
||||
|
||||
public void SwitchUISides(){
|
||||
if(ControlSettings.ControlIsOnRight){
|
||||
joystick.anchorMin = new Vector2(0,0);
|
||||
joystick.anchorMax = new Vector2(0.5f, 1);
|
||||
|
||||
btn_boost.anchorMin = new Vector2(1,0);
|
||||
btn_boost.anchorMax = new Vector2(1,0);
|
||||
btn_boost.position = new Vector2(Screen.width-150, btn_boost.position.y);
|
||||
Vector2 newDef = new Vector2(defaultJoyPos.x, defaultJoyPos.y);
|
||||
if(isRanked){
|
||||
if(ControlSettings.ControlIsOnRight){
|
||||
RectTransform canvasRect = joystick.root.GetComponent<RectTransform>();
|
||||
joystick.anchorMin = new Vector2(0f,0);
|
||||
joystick.anchorMax = new Vector2(0.5f, 1);
|
||||
joystick.localPosition = new Vector2(-canvasRect.sizeDelta.x /4f,0);
|
||||
Vector2 newDef = new Vector2(defaultJoyPos.x, defaultJoyPos.y);
|
||||
|
||||
joystick.GetComponent<Joystick>().SetDefaultPosition(newDef);
|
||||
joystick.GetComponent<Joystick>().SetDefaultPosition(newDef);
|
||||
|
||||
btn_boost.anchorMin = new Vector2(0,0);
|
||||
btn_boost.anchorMax = new Vector2(0,0);
|
||||
btn_boost.localPosition = new Vector2(150, btn_boost.localPosition.y);
|
||||
Debug.Log(btn_boost.localPosition);
|
||||
}else{
|
||||
RectTransform canvasRect = joystick.root.GetComponent<RectTransform>();
|
||||
joystick.anchorMin = new Vector2(0.5f,0);
|
||||
joystick.anchorMax = new Vector2(1f, 1);
|
||||
joystick.localPosition = new Vector2(canvasRect.sizeDelta.x /4f,0);
|
||||
Vector2 newDef = new Vector2(-defaultJoyPos.x, defaultJoyPos.y);
|
||||
|
||||
joystick.GetComponent<Joystick>().SetDefaultPosition(newDef);
|
||||
|
||||
btn_boost.anchorMin = new Vector2(0,0);
|
||||
btn_boost.anchorMax = new Vector2(0,0);
|
||||
btn_boost.localPosition = new Vector2(150-(canvasRect.sizeDelta.x/2f), btn_boost.localPosition.y);
|
||||
Debug.Log(btn_boost.localPosition);
|
||||
}
|
||||
}else{
|
||||
joystick.anchorMin = new Vector2(0.5f,0);
|
||||
joystick.anchorMax = new Vector2(1f, 1);
|
||||
btn_boost.anchorMin = new Vector2(0,0);
|
||||
btn_boost.anchorMax = new Vector2(0,0);
|
||||
btn_boost.position = new Vector2(150, btn_boost.position.y);
|
||||
Vector2 newDef = new Vector2(-defaultJoyPos.x, defaultJoyPos.y);
|
||||
if(ControlSettings.ControlIsOnRight){
|
||||
Debug.Log("Switching to right");
|
||||
joystick.anchorMin = new Vector2(0,0);
|
||||
joystick.anchorMax = new Vector2(0.5f, 1);
|
||||
|
||||
btn_boost.anchorMin = new Vector2(1,0);
|
||||
btn_boost.anchorMax = new Vector2(1,0);
|
||||
btn_boost.position = new Vector2(Screen.width-150, btn_boost.position.y);
|
||||
Vector2 newDef = new Vector2(defaultJoyPos.x, defaultJoyPos.y);
|
||||
|
||||
joystick.GetComponent<Joystick>().SetDefaultPosition(newDef);
|
||||
joystick.GetComponent<Joystick>().SetDefaultPosition(newDef);
|
||||
}else{
|
||||
joystick.anchorMin = new Vector2(0.5f,0);
|
||||
joystick.anchorMax = new Vector2(1f, 1);
|
||||
btn_boost.anchorMin = new Vector2(0,0);
|
||||
btn_boost.anchorMax = new Vector2(0,0);
|
||||
btn_boost.position = new Vector2(150, btn_boost.position.y);
|
||||
Vector2 newDef = new Vector2(-defaultJoyPos.x, defaultJoyPos.y);
|
||||
|
||||
joystick.GetComponent<Joystick>().SetDefaultPosition(newDef);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -115,7 +148,11 @@ public class MinigameManager : NetworkBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(RankedGameStarted && players.Length < 2){
|
||||
//Forfeited!
|
||||
winnerId = (int)players[0].netId;
|
||||
// players[0].WonRanked();
|
||||
}
|
||||
if(RankedGameStarted){
|
||||
if(timeElapsed > safeZoneCoolTime){
|
||||
if(!shrinkStarted){
|
||||
@@ -144,11 +181,7 @@ public class MinigameManager : NetworkBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
if(RankedGameStarted && players.Length < 2){
|
||||
//Forfeited!
|
||||
winnerId = (int)players[0].netId;
|
||||
// players[0].WonRanked();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void OnMapRadisuChanged(float oldVal, float newVal){
|
||||
@@ -309,9 +342,15 @@ public class MinigameManager : NetworkBehaviour
|
||||
{
|
||||
StartCoroutine(setRespawn(player));
|
||||
}
|
||||
|
||||
|
||||
public void Restart(){
|
||||
if(SceneData.localPlayer.GetComponent<SpaceshipController>().dead){
|
||||
SetRespawn(SceneData.localPlayer);
|
||||
// SetRespawn(SceneData.localPlayer);
|
||||
AdsManager.SetOnInterestitialClosed(()=>{SetRespawn(SceneData.localPlayer);});
|
||||
if(!SceneData.holder.ShowAds()){
|
||||
SetRespawn(SceneData.localPlayer);
|
||||
}
|
||||
}else{
|
||||
Debug.LogError("You aren't dead, you can't restart unless you are dead.");
|
||||
}
|
||||
|
||||
@@ -91,7 +91,6 @@ public class PickupItem : NetworkBehaviour
|
||||
active=false;
|
||||
// gameObject.SetActive(false);
|
||||
StartCoroutine(MoveToPlayer(playerPos));
|
||||
SceneData.GameManager.DeactivatePickupItem(this);
|
||||
}
|
||||
|
||||
IEnumerator MoveToPlayer(Transform position){
|
||||
@@ -105,6 +104,8 @@ public class PickupItem : NetworkBehaviour
|
||||
ParticleSystem particle = EffectPool.Spawn(PickupEffect, transform.position).GetComponent<ParticleSystem>();
|
||||
particle.startColor = type.GetColor();
|
||||
}
|
||||
SceneData.GameManager.DeactivatePickupItem(this);
|
||||
|
||||
gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
|
||||
@@ -47,14 +47,20 @@ public class SceneDataHolder : MonoBehaviour
|
||||
|
||||
|
||||
}
|
||||
|
||||
public async void ShowAds(){
|
||||
public void ShowAd(){
|
||||
ShowAds();
|
||||
}
|
||||
public bool ShowAds(){
|
||||
|
||||
if(MinigameManager.instance.isRanked){
|
||||
if(AdsManager.instance!=null && (DateTime.Now - lastShownTime).Minutes > 10){
|
||||
AdsManager.instance.ShowInterestitial();
|
||||
lastShownTime = DateTime.Now;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -170,6 +170,7 @@ public class SkinShopManager : MonoBehaviour
|
||||
|
||||
void onUpgrade(){
|
||||
upgradePanel.Show(selectedSkin.name);
|
||||
AudioManager.instnace.UIPopup();
|
||||
}
|
||||
|
||||
public void onBuy(){
|
||||
|
||||
@@ -180,13 +180,21 @@ public class SpaceshipController : NetworkBehaviour
|
||||
}
|
||||
|
||||
CameraFollower.instance.ShakeBoost();
|
||||
Vibrate();
|
||||
|
||||
// GameObject fx = EffectPool.Spawn(boostStartEffect, transform.position);
|
||||
foreach(ParticleSystem particle in boostStartEffect){
|
||||
particle.Play();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Vibrate(){
|
||||
#if UNITY_ANDROID
|
||||
if(ControlSettings.HapticEnabled){
|
||||
Handheld.Vibrate();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
void OnBoostUp()
|
||||
{
|
||||
if (isLocalPlayer)
|
||||
@@ -312,6 +320,7 @@ public class SpaceshipController : NetworkBehaviour
|
||||
int lastClientUpdateTime = 0;
|
||||
Vector3 lineCorrection;
|
||||
float scale => Mathf.Clamp(1 + (trailTime * _scaleMultiplier), 1, 10);
|
||||
long lastTime ;
|
||||
void Update()
|
||||
{
|
||||
if (MinigameManager.instance.isRanked && !MinigameManager.instance.RankedGameStarted) { return; }
|
||||
@@ -343,6 +352,12 @@ public class SpaceshipController : NetworkBehaviour
|
||||
DBmanager.SetMostTime((int)survivalTime);
|
||||
}
|
||||
SceneData.SetTimerTxt(survivalTime);
|
||||
|
||||
body.position = Vector3.Lerp(body.position,targetState.Position,MovementSmoothnessFactor * movingSpeed * Vector2.Distance(targetState.Position, body.position));
|
||||
body.rotation = Quaternion.Lerp(body.rotation, targetState.Rotation,MovementSmoothnessFactor*movingSpeed);
|
||||
Debug.Log(lastTime - currentTick);
|
||||
lastTime = targetState.Tick;
|
||||
CameraFollower.UpdateFrame();
|
||||
}
|
||||
|
||||
timer += Time.deltaTime;
|
||||
@@ -387,8 +402,8 @@ public class SpaceshipController : NetworkBehaviour
|
||||
// transform.Rotate(transform.up * input.x);
|
||||
UpdateStates(currentTick, NetworkTime.rtt, input, curState.Position, curState.Rotation);
|
||||
|
||||
body.position = targetState.Position;
|
||||
body.rotation = targetState.Rotation;
|
||||
// body.position = targetState.Position;
|
||||
// body.rotation = targetState.Rotation;
|
||||
// body.position = Vector3.Lerp(body.position,targetState.Position,MovementSmoothnessFactor * movingSpeed);
|
||||
// body.rotation = Quaternion.Lerp(body.rotation, targetState.Rotation,MovementSmoothnessFactor*movingSpeed);
|
||||
}else if (isServer){
|
||||
@@ -402,7 +417,7 @@ public class SpaceshipController : NetworkBehaviour
|
||||
// HandleInput(m_Input);
|
||||
// }
|
||||
}
|
||||
if(isLocalPlayer){CameraFollower.UpdateFrame();}
|
||||
// if(isLocalPlayer){CameraFollower.UpdateFrame();}
|
||||
|
||||
float stateError = clientStateBuffer[bufferIndex].Difference(serverStateBuffer[latencyBufferIndex]);
|
||||
foreach(ParticleSystem boostEffect in boostEffects){
|
||||
@@ -478,6 +493,7 @@ public class SpaceshipController : NetworkBehaviour
|
||||
}
|
||||
[ClientRpc]
|
||||
void RpcRubberband(Vector3 m_position, Quaternion m_rotation){
|
||||
return;
|
||||
PlayerState serverState = new PlayerState(){Tick=0, Position = m_position, Rotation = m_rotation};
|
||||
PlayerState clientState = new PlayerState(){Tick=0, Position = transform.position, Rotation = transform.rotation};
|
||||
float diff = serverState.Difference(clientState);
|
||||
@@ -608,7 +624,7 @@ public class SpaceshipController : NetworkBehaviour
|
||||
[ClientRpc]
|
||||
void RpcShowDeathEffect(Vector2 position){
|
||||
EffectPool.Spawn(DeathEffect, position);
|
||||
EffectPool.Spawn(debrisEffect, position).GetComponent<DebrisEffect>().Play();
|
||||
// EffectPool.Spawn(debrisEffect, position).GetComponent<DebrisEffect>().Play();
|
||||
}
|
||||
|
||||
void OnKill()
|
||||
@@ -624,7 +640,7 @@ public class SpaceshipController : NetworkBehaviour
|
||||
[ClientRpc]
|
||||
void RpcOnKill()
|
||||
{
|
||||
|
||||
Vibrate();
|
||||
}
|
||||
|
||||
void OnKillsChanged(int oldVal, int newVal)
|
||||
@@ -700,6 +716,7 @@ public class SpaceshipController : NetworkBehaviour
|
||||
{
|
||||
|
||||
MinigameManager.instance.SpawnLeftoverPickups(transform.position, (int)((float)Scores / 4f));
|
||||
|
||||
RpcShowDeathEffect(transform.position);
|
||||
Debug.Log($"Sending death signal to {pname} by {killer}");
|
||||
|
||||
@@ -739,6 +756,7 @@ public class SpaceshipController : NetworkBehaviour
|
||||
if (MinigameManager.instance.winnerId <= 0)
|
||||
{
|
||||
Debug.LogError("Winner ID not synced yet");
|
||||
checkWinner(1000);
|
||||
}
|
||||
if (MinigameManager.instance.winnerId != netId)
|
||||
{
|
||||
@@ -757,6 +775,24 @@ public class SpaceshipController : NetworkBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
async void checkWinner(int delay){
|
||||
await System.Threading.Tasks.Task.Delay(delay);
|
||||
|
||||
if (MinigameManager.instance.winnerId != netId)
|
||||
{
|
||||
//LOSER!
|
||||
MinigameManager.instance.rankedSummary.ShowLoss();
|
||||
AudioManager.instnace.MinigameLost();
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
MinigameManager.instance.rankedSummary.ShowWin();
|
||||
AudioManager.instnace.MinigameWon();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
IEnumerator ShowRankedResults()
|
||||
{
|
||||
while (MinigameManager.instance.winnerId <= 0)
|
||||
|
||||
@@ -330,6 +330,8 @@ public class SelectedItemMenu : MonoBehaviour
|
||||
}
|
||||
|
||||
public void OnGoldmineCapUpgrade(){
|
||||
HideUpgradeMenu();
|
||||
|
||||
if(Selector.selectedBuilding.GetComponent<GoldMine>()!=null){
|
||||
int L = Selector.selectedBuilding.curLevel+1;
|
||||
int C = GoldMine.GetCapacityRateByLevel(L);
|
||||
@@ -340,7 +342,6 @@ public class SelectedItemMenu : MonoBehaviour
|
||||
upgradeBtn.interactable= false;
|
||||
Selector.selectedBuilding.Upgrade(newLevel:newLevel-1, gold_cost:GoldMine.GetGoldCostForCapacity(L), metal_cost: GoldMine.GetMetalCostForCapacity(L) );
|
||||
// goldmineUpgradeMenu.SetActive(false);
|
||||
HideUpgradeMenu();
|
||||
|
||||
OnUpgradeMenuClicked();
|
||||
}else{
|
||||
@@ -359,6 +360,7 @@ public class SelectedItemMenu : MonoBehaviour
|
||||
}
|
||||
|
||||
public void OnGoldmineProdUpgrade(){
|
||||
HideUpgradeMenu();
|
||||
if(Selector.selectedBuilding.GetComponent<GoldMine>()!=null){
|
||||
|
||||
int L = Selector.selectedBuilding.curLevel+1;
|
||||
@@ -379,9 +381,10 @@ public class SelectedItemMenu : MonoBehaviour
|
||||
|
||||
}
|
||||
// goldmineUpgradeMenu.SetActive(false);
|
||||
HideUpgradeMenu();
|
||||
|
||||
OnUpgradeMenuClicked();
|
||||
HideUpgradeMenu();
|
||||
|
||||
}
|
||||
|
||||
void OnInfoClicked()
|
||||
|
||||
@@ -3387,18 +3387,4 @@ AnimationClip:
|
||||
script: {fileID: 0}
|
||||
m_HasGenericRootTransform: 1
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events:
|
||||
- time: 0
|
||||
functionName: PlayChestOpenRiser
|
||||
data:
|
||||
objectReferenceParameter: {fileID: 0}
|
||||
floatParameter: 0
|
||||
intParameter: 0
|
||||
messageOptions: 0
|
||||
- time: 1.3166667
|
||||
functionName: PlayChestOpen
|
||||
data:
|
||||
objectReferenceParameter: {fileID: 0}
|
||||
floatParameter: 0
|
||||
intParameter: 0
|
||||
messageOptions: 0
|
||||
m_Events: []
|
||||
|
||||
Reference in New Issue
Block a user