From a1e02133a2f6677bb4a5df68650ed9aafbed5d2e Mon Sep 17 00:00:00 2001 From: 5jiji Date: Mon, 26 Feb 2024 14:35:03 +0100 Subject: [PATCH 1/5] Made 'Bucket Switcher' more Balanced. Co-authored-by: Andre601 Co-authored-by: Thedoczek --- .../AllRarities/Bucket Switcher.prefab | 54 ++++++++++++--- Assets/Scripts/Games/BucketSwitcherGame.cs | 68 ++++++++++++------- 2 files changed, 87 insertions(+), 35 deletions(-) diff --git a/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab b/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab index a3fdf421..df6d0a49 100644 --- a/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab +++ b/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab @@ -13114,7 +13114,7 @@ MonoBehaviour: _deathBallSpawnPoint: {fileID: 2852405923097721674} _ringColor: {r: 1, g: 0.9751305, b: 0, a: 1} _deathBallWarningColor: {r: 0.8301887, g: 0.20898668, b: 0, a: 1} - _deathballPattern: 00000100000100010001010101 + _deathballPattern: 00000000010000010001000101 --- !u!1 &7483166950564947456 GameObject: m_ObjectHideFlags: 0 @@ -13857,11 +13857,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198733809829394089, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 10 + value: 20 objectReference: {fileID: 0} - target: {fileID: 198733809829394089, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 20 + value: 1 objectReference: {fileID: 0} - target: {fileID: 435933497969762261, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_IsActive @@ -13939,6 +13939,10 @@ PrefabInstance: propertyPath: _effect value: 1 objectReference: {fileID: 0} + - target: {fileID: 2217681019111014017, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3272580564613781342, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z value: 1.2 @@ -13953,7 +13957,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3643829012493589635, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z - value: 0.54 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 4253336707757313819, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value @@ -13971,13 +13975,17 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5586353403376928098, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5873385134661750090, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 10 + value: 20 objectReference: {fileID: 0} - target: {fileID: 5873385134661750090, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 20 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6513952693467918015, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z @@ -13989,7 +13997,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7048420251274192736, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z - value: 0.54 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 7653099011671737493, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value @@ -14172,6 +14180,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 1.2 objectReference: {fileID: 0} + - target: {fileID: 89289836227949916, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 198733809829394089, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value value: 10 @@ -14246,11 +14258,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2105990114058059124, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 5 + value: 10 objectReference: {fileID: 0} - target: {fileID: 2105990114058059124, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 20 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2217681019111014017, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_Enabled @@ -14264,6 +14276,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 3272580564613781342, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2 + objectReference: {fileID: 0} - target: {fileID: 3480812452627126860, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value value: 10 @@ -14284,6 +14300,10 @@ PrefabInstance: propertyPath: _effect value: 1 objectReference: {fileID: 0} + - target: {fileID: 4524060876000160140, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 0.54 + objectReference: {fileID: 0} - target: {fileID: 4596019487136999015, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_IsActive value: 1 @@ -14300,17 +14320,25 @@ PrefabInstance: propertyPath: _effect value: 1 objectReference: {fileID: 0} + - target: {fileID: 6513952693467918015, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 6532685879796167447, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 0.54 + objectReference: {fileID: 0} - target: {fileID: 7048420251274192736, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z value: 1.2 objectReference: {fileID: 0} - target: {fileID: 7653099011671737493, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 5 + value: 10 objectReference: {fileID: 0} - target: {fileID: 7653099011671737493, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 20 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7708952294535534909, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value @@ -14324,6 +14352,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8516737333072432317, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/Games/BucketSwitcherGame.cs b/Assets/Scripts/Games/BucketSwitcherGame.cs index 30186477..58925195 100644 --- a/Assets/Scripts/Games/BucketSwitcherGame.cs +++ b/Assets/Scripts/Games/BucketSwitcherGame.cs @@ -25,6 +25,8 @@ public BottomTarget(GameObject _bottom, Vector3 _target, float _speed) [HideInInspector] private List _bottomTargets = new List(); + private int _currState = 0; + public override void OnTilePreInit() { int survivalReward = AppConfig.GetMult(_gt.RarityType); @@ -33,10 +35,7 @@ public override void OnTilePreInit() survivalReward *= AppConfig.inst.GetI("GoldenTileMultiplier"); foreach (var effector in _gt.Effectors) - { - effector.ResetValue(false); effector.MultiplyCurrValue(survivalReward); - } } public void Update() @@ -45,8 +44,8 @@ public void Update() for (int i = 0; i < _bottomTargets.Count(); i++) { - bool removeTarget = MoveBottom(_bottomTargets[i].bottom, _bottomTargets[i].target, _bottomTargets[i].speed); - if (removeTarget) + bool hasMoved = MoveBottom(_bottomTargets[i].bottom, _bottomTargets[i].target, _bottomTargets[i].speed); + if (!hasMoved) indexesToRemove.Add(i); } @@ -55,9 +54,7 @@ public void Update() indexesToRemove = indexesToRemove.OrderBy(x => -x).ToList(); foreach (var index in indexesToRemove) - { _bottomTargets.RemoveAt(index); - } } public override void StartGame() @@ -87,38 +84,50 @@ private IEnumerator RunGame() private void SwitchEffectors() { - foreach (var effector in _gt.Effectors) + _currState++; + if (_currState >= 4) + _currState = 0; + + for (int i = 0; i < _gt.Effectors.Length; i++) { - if (effector.GetEffect().HasFlag(PBEffect.Subtract)) + PBEffector effector = _gt.Effectors[i]; + + int workState = _currState; + if (i >= _gt.Effectors.Length / 2) + workState++; + if (workState >= 4) + workState = 0; + + if (i % 4 == workState) { - effector.SetEffect(PBEffect.Add); - effector.MultiplyCurrValue(2.0f); + effector.SetEffect(PBEffect.Subtract | PBEffect.Explode); + effector.MultiplyCurrValue(0.5f); GameObject bottom = effector.transform.Find("Bottom").gameObject; BoxCollider2D collider = bottom.GetComponent(); if (collider != null) - collider.enabled = false; + collider.enabled = true; Vector3 position = bottom.transform.position; - position.z = 1.34f; + position.z = 0.54f; BottomTarget target = new BottomTarget(bottom, position, 0.05f); _bottomTargets.Add(target); } - else if (effector.GetEffect().HasFlag(PBEffect.Add)) + else if (effector.GetEffect().HasFlag(PBEffect.Subtract)) { - effector.SetEffect(PBEffect.Subtract | PBEffect.Explode); - effector.MultiplyCurrValue(0.5f); + effector.SetEffect(PBEffect.Add); + effector.MultiplyCurrValue(2.0f); GameObject bottom = effector.transform.Find("Bottom").gameObject; BoxCollider2D collider = bottom.GetComponent(); if (collider != null) - collider.enabled = true; + collider.enabled = false; Vector3 position = bottom.transform.position; - position.z = 0.58f; + position.z = 1.2f; BottomTarget target = new BottomTarget(bottom, position, 0.05f); _bottomTargets.Add(target); @@ -129,20 +138,31 @@ private void SwitchEffectors() private bool MoveBottom(GameObject bottom, Vector3 target, float speed) { if (bottom.transform.position == target) - return true; + return false; Vector3 nextPos = Vector3.MoveTowards(bottom.transform.position, target, speed); - - if (Vector3.Distance(nextPos, target) < 0.1f) - return true; - bottom.transform.position = nextPos; - return false; + return true; } public override void CleanUpGame() { + _currState = 0; + for (int i = 0; i < _gt.Effectors.Length; i++) + { + int workState = 0; + if (i >= _gt.Effectors.Length / 2) + workState++; + + PBEffector effector = _gt.Effectors[i]; + effector.ResetValue(false); + if (i % 4 == 0) + effector.SetEffect(PBEffect.Subtract | PBEffect.Explode); + else + effector.SetEffect(PBEffect.Add); + } + _timer.SetText(MyUtil.GetMinuteSecString(0)); _bottomTargets.Clear(); IsGameStarted = false; From 4c18e46817021bc46a7fc17422bec47f6d068573 Mon Sep 17 00:00:00 2001 From: 5jiji Date: Mon, 26 Feb 2024 17:36:49 +0100 Subject: [PATCH 2/5] Setup the Deathball pattern Co-authored-by: Andre601 --- Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab b/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab index df6d0a49..4e99b154 100644 --- a/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab +++ b/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab @@ -6302,9 +6302,9 @@ Transform: - {fileID: 3958117705110722027} - {fileID: 6495008255651215659} - {fileID: 2647251505547869332} - - {fileID: 7705725927872479511} - {fileID: 2745699299756847182} - {fileID: 3712729501977518319} + - {fileID: 7705725927872479511} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7650660916348049875 @@ -13114,7 +13114,7 @@ MonoBehaviour: _deathBallSpawnPoint: {fileID: 2852405923097721674} _ringColor: {r: 1, g: 0.9751305, b: 0, a: 1} _deathBallWarningColor: {r: 0.8301887, g: 0.20898668, b: 0, a: 1} - _deathballPattern: 00000000010000010001000101 + _deathballPattern: 00000100010001010101010101 --- !u!1 &7483166950564947456 GameObject: m_ObjectHideFlags: 0 From 9f0fe6e9b56315148569ef009677cfb63404df2c Mon Sep 17 00:00:00 2001 From: 5jiji Date: Tue, 27 Feb 2024 13:22:28 +0100 Subject: [PATCH 3/5] Remade the tile to be more balanced Co-authored-by: Andre601 Co-authored-by: Thedoczek --- .../AllRarities/Bucket Switcher.prefab | 2191 ++++++++++++----- Assets/Scripts/Games/BucketSwitcherGame.cs | 20 +- 2 files changed, 1544 insertions(+), 667 deletions(-) diff --git a/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab b/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab index 4e99b154..5f0f3d2e 100644 --- a/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab +++ b/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab @@ -644,7 +644,7 @@ PolygonCollider2D: - {x: -0.5, y: -0.5} - {x: 0.5, y: -0.5} m_UseDelaunayMesh: 0 ---- !u!1 &1068523322980961905 +--- !u!1 &636065219703748964 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -652,273 +652,648 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 623501345923028223} - - component: {fileID: 6472079371889171386} - - component: {fileID: 1848932312184344272} + - component: {fileID: 9017829543398357256} + - component: {fileID: 7314596495117125647} + - component: {fileID: 6165789233650056032} + - component: {fileID: 1695545800735014243} + - component: {fileID: 9096353936842842538} + - component: {fileID: 3269332372928855189} m_Layer: 0 - m_Name: ParticleSystem1 (1) + m_Name: Prism m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &623501345923028223 +--- !u!4 &9017829543398357256 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1068523322980961905} + m_GameObject: {fileID: 636065219703748964} 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_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: -5.3219, y: 6.28, z: 0.28} + m_LocalScale: {x: 0.53999996, y: 0.8662401, z: 0.59} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6495008255651215659} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!198 &6472079371889171386 -ParticleSystem: + m_Father: {fileID: 7734060114670211816} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!114 &7314596495117125647 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1068523322980961905} - serializedVersion: 8 - lengthInSec: 5 - simulationSpeed: 1 - stopAction: 0 - cullingMode: 0 - ringBufferMode: 0 - ringBufferLoopRange: {x: 0, y: 1} - emitterVelocityMode: 1 - looping: 1 - prewarm: 0 - playOnAwake: 1 - useUnscaledTime: 0 - autoRandomSeed: 1 - startDelay: - serializedVersion: 2 - minMaxState: 0 - scalar: 0 - minScalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - 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 - minCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - 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 - moveWithTransform: 1 - moveWithCustomTransform: {fileID: 0} - scalingMode: 1 - randomSeed: 0 - InitialModule: - serializedVersion: 3 - enabled: 1 - startLifetime: - serializedVersion: 2 - minMaxState: 0 - scalar: 0.5 - minScalar: 5 - maxCurve: - 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: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - 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: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - startSpeed: - serializedVersion: 2 - minMaxState: 0 - scalar: 3.95 - minScalar: 5 - maxCurve: - 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: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - 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: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - startColor: - serializedVersion: 2 - minMaxState: 0 - minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 0.9715525, b: 0, a: 1} - maxGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - minGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 + m_GameObject: {fileID: 636065219703748964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MeshFormatVersion: 2 + m_Faces: + - m_Indexes: 020000000100000000000000 + m_SmoothingGroup: 0 + m_Uv: + m_UseWorldSpace: 0 + m_FlipU: 0 + m_FlipV: 0 + m_SwapUV: 0 + m_Fill: 1 + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Rotation: 0 + m_Anchor: 9 + m_Material: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SubmeshIndex: 0 + m_ManualUV: 0 + elementGroup: 0 + m_TextureGroup: -1 + - m_Indexes: 050000000400000003000000050000000600000004000000 + m_SmoothingGroup: 0 + m_Uv: + m_UseWorldSpace: 0 + m_FlipU: 0 + m_FlipV: 0 + m_SwapUV: 0 + m_Fill: 1 + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Rotation: 0 + m_Anchor: 9 + m_Material: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SubmeshIndex: 0 + m_ManualUV: 0 + elementGroup: 0 + m_TextureGroup: -1 + - m_Indexes: 090000000800000007000000 + m_SmoothingGroup: 0 + m_Uv: + m_UseWorldSpace: 0 + m_FlipU: 0 + m_FlipV: 0 + m_SwapUV: 0 + m_Fill: 1 + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Rotation: 0 + m_Anchor: 9 + m_Material: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SubmeshIndex: 0 + m_ManualUV: 0 + elementGroup: 0 + m_TextureGroup: -1 + - m_Indexes: 0c0000000b0000000a0000000c0000000d0000000b000000 + m_SmoothingGroup: 0 + m_Uv: + m_UseWorldSpace: 0 + m_FlipU: 0 + m_FlipV: 0 + m_SwapUV: 0 + m_Fill: 1 + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Rotation: 0 + m_Anchor: 9 + m_Material: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SubmeshIndex: 0 + m_ManualUV: 0 + elementGroup: 0 + m_TextureGroup: -1 + - m_Indexes: 0e0000000f000000100000000f0000001100000010000000 + m_SmoothingGroup: 0 + m_Uv: + m_UseWorldSpace: 0 + m_FlipU: 0 + m_FlipV: 0 + m_SwapUV: 0 + m_Fill: 1 + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Rotation: 0 + m_Anchor: 9 + m_Material: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SubmeshIndex: 0 + m_ManualUV: 0 + elementGroup: 0 + m_TextureGroup: -1 + m_SharedVertices: + - m_Vertices: 000000000b0000000e000000 + - m_Vertices: 01000000030000000f000000 + - m_Vertices: 02000000050000000d000000 + - m_Vertices: 040000000700000011000000 + - m_Vertices: 06000000090000000c000000 + - m_Vertices: 080000000a00000010000000 + m_SharedTextures: [] + m_Positions: + - {x: -0.5, y: -0.5, z: -0.5} + - {x: 0.5, y: -0.5, z: -0.5} + - {x: 0, y: 0.5, z: -0.5} + - {x: 0.5, y: -0.5, z: -0.5} + - {x: 0.5, y: -0.5, z: 0.5} + - {x: 0, y: 0.5, z: -0.5} + - {x: 0, y: 0.5, z: 0.5} + - {x: 0.5, y: -0.5, z: 0.5} + - {x: -0.5, y: -0.5, z: 0.5} + - {x: 0, y: 0.5, z: 0.5} + - {x: -0.5, y: -0.5, z: 0.5} + - {x: -0.5, y: -0.5, z: -0.5} + - {x: 0, y: 0.5, z: 0.5} + - {x: 0, y: 0.5, z: -0.5} + - {x: -0.5, y: -0.5, z: -0.5} + - {x: 0.5, y: -0.5, z: -0.5} + - {x: -0.5, y: -0.5, z: 0.5} + - {x: 0.5, y: -0.5, z: 0.5} + m_Textures0: + - {x: -0.5, y: -0.5} + - {x: 0.5, y: -0.5} + - {x: 0, y: 0.5} + - {x: -0.5, y: -0.67082036} + - {x: 0.5, y: -0.67082036} + - {x: -0.5, y: 0.4472136} + - {x: 0.5, y: 0.4472136} + - {x: -0.5, y: -0.5} + - {x: 0.5, y: -0.5} + - {x: 0, y: 0.5} + - {x: -0.5, y: -0.67082036} + - {x: 0.5, y: -0.67082036} + - {x: -0.5, y: 0.4472136} + - {x: 0.5, y: 0.4472136} + - {x: 0.5, y: -0.5} + - {x: -0.5, y: -0.5} + - {x: 0.5, y: 0.5} + - {x: -0.5, y: 0.5} + m_Textures2: [] + m_Textures3: [] + m_Tangents: + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + m_Colors: [] + m_UnwrapParameters: + m_HardAngle: 88 + m_PackMargin: 20 + m_AngleError: 8 + m_AreaError: 15 + m_PreserveMeshAssetOnDestroy: 0 + assetGuid: + m_Mesh: {fileID: 0} + m_VersionIndex: 4259 + m_IsSelectable: 1 + m_SelectedFaces: + m_SelectedEdges: [] + m_SelectedVertices: +--- !u!114 &6165789233650056032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636065219703748964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1ca002da428252441b92f28d83c8a65f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Shape: + rid: 7705887902649025520 + m_Size: {x: 1, y: 1, z: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_PivotLocation: 0 + m_PivotPosition: {x: 0, y: 0, z: 0} + m_UnmodifiedMeshVersion: 4259 + m_ShapeBox: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 0.5} + references: + version: 2 + RefIds: + - rid: 7705887902649025520 + type: {class: Prism, ns: UnityEngine.ProBuilder.Shapes, asm: Unity.ProBuilder} + data: +--- !u!23 &1695545800735014243 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636065219703748964} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + 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: 2 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &9096353936842842538 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636065219703748964} + m_Mesh: {fileID: 0} +--- !u!60 &3269332372928855189 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636065219703748964} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 2b2467b94baf94546a1257c3affbaebd, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0, y: 0.5} + - {x: -0.5, y: -0.5} + - {x: 0.5, y: -0.5} + m_UseDelaunayMesh: 0 +--- !u!1 &864356866523913424 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2156181072557078925} + m_Layer: 0 + m_Name: First Part + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2156181072557078925 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 864356866523913424} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.42870018, y: 2.2, z: -4.49753} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7734060114670211816} + - {fileID: 4314196782397581867} + m_Father: {fileID: 746487210997908662} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1068523322980961905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 623501345923028223} + - component: {fileID: 6472079371889171386} + - component: {fileID: 1848932312184344272} + m_Layer: 0 + m_Name: ParticleSystem1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &623501345923028223 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068523322980961905} + 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: 6495008255651215659} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!198 &6472079371889171386 +ParticleSystem: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068523322980961905} + serializedVersion: 8 + lengthInSec: 5 + simulationSpeed: 1 + stopAction: 0 + cullingMode: 0 + ringBufferMode: 0 + ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 1 + looping: 1 + prewarm: 0 + playOnAwake: 1 + useUnscaledTime: 0 + autoRandomSeed: 1 + startDelay: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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 + moveWithTransform: 1 + moveWithCustomTransform: {fileID: 0} + scalingMode: 1 + randomSeed: 0 + InitialModule: + serializedVersion: 3 + enabled: 1 + startLifetime: + serializedVersion: 2 + minMaxState: 0 + scalar: 0.5 + minScalar: 5 + maxCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + startSpeed: + serializedVersion: 2 + minMaxState: 0 + scalar: 3.95 + minScalar: 5 + maxCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + startColor: + serializedVersion: 2 + minMaxState: 0 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 0.9715525, b: 0, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 atime3: 0 atime4: 0 atime5: 0 @@ -6234,27 +6609,311 @@ BoxCollider2D: m_Bits: 4294967295 m_ContactCaptureLayers: serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.0000001, y: 1.5} + m_EdgeRadius: 0 +--- !u!1 &2491348552388521466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 746487210997908662} + - component: {fileID: 7650660916348049875} + m_Layer: 0 + m_Name: Bucket Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &746487210997908662 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2491348552388521466} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4285832540389516063} + - {fileID: 3486789976817481892} + - {fileID: 4426728696042940828} + - {fileID: 8403946452199375258} + - {fileID: 7259074507297002687} + - {fileID: 1871122324605241164} + - {fileID: 8018555868119998615} + - {fileID: 5271847991484246754} + - {fileID: 860234554731157289} + - {fileID: 8530902368550358140} + - {fileID: 6039025064665309388} + - {fileID: 6325235137861599459} + - {fileID: 3832213890724612316} + - {fileID: 1965222229307729085} + - {fileID: 2702872153647452578} + - {fileID: 3958117705110722027} + - {fileID: 6495008255651215659} + - {fileID: 2647251505547869332} + - {fileID: 2156181072557078925} + - {fileID: 2745699299756847182} + - {fileID: 3712729501977518319} + - {fileID: 7705725927872479511} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7650660916348049875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2491348552388521466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c51b7c66d710db348a5f4d4667500ec2, type: 3} + m_Name: + m_EditorClassIdentifier: + TileIDNum: 0 + _game: {fileID: 3651332649757162098} + _suddenDeath: {fileID: 7325491386596941882} + _cleaningBarController: {fileID: 5085424688749015081} + _releaseBar: {fileID: 3486789976817481892} + _tileNameText: {fileID: 88268596640976697} + _rarityText: {fileID: 6965428202780938223} + _timerText: {fileID: 5961916702511309131} + _ticketBonusAmountText: {fileID: 7424343479445784218} + TicketBonusAmount: 0 + TileState: 0 + RarityType: 0 + DurationTYpe: 0 + IsGolden: 0 + IsShop: 0 + _cycleMode: 2 + _updateCycleModeButton: 0 + _contactWarp: {fileID: 2221752522102408061} + _resetablesRoot: {fileID: 2702872153647452578} + _background: {fileID: 2532240964184548847} + _tileDurationS: 60 + MinAuctionSlots: 0 + MaxAuctionSlots: 8 + RaffleSlots: 8 + AuctionDuration: 15 + finishTileButton: 0 + EntrancePipe: {fileID: 3853338807257938560} + _goldenVisuals: {fileID: 105688910835791150} + _colorTrimsByRarity: + - {fileID: 6327524171554363783} + - {fileID: 5905202177163288322} + - {fileID: 1319270291859773841} + - {fileID: 3360055215466819110} + - {fileID: 7091515534910087112} + ConveyorBelt: [] + _backgroundStartColor: {r: 0, g: 0, b: 0, a: 0} + _backgroundEndColor: {r: 0, g: 0, b: 0, a: 0} + _trimColor: {r: 0, g: 0, b: 0, a: 0} + Effectors: [] + CurrentSide: 2 + Players: [] + AlivePlayers: [] + EliminatedPlayers: [] + _waitForAll: 0 + _waitForAllDead: 1 +--- !u!1 &2664301243833230550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3832213890724612316} + - component: {fileID: 2638478161653049529} + - component: {fileID: 7424343479445784218} + m_Layer: 0 + m_Name: WinPrizeText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3832213890724612316 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2664301243833230550} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.646} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 746487210997908662} + 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: -2.94, y: 9.47} + m_SizeDelta: {x: 4, y: 0.74} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &2638478161653049529 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2664301243833230550} + 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: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &7424343479445784218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2664301243833230550} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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: 'Win Prize: 1345' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1.0000001, y: 1.5} - m_EdgeRadius: 0 ---- !u!1 &2491348552388521466 + rgba: 4294967295 + m_fontSize: 4.9 + m_fontSizeBase: 9.67 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 0 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2638478161653049529} + m_maskType: 0 +--- !u!1 &3373537576598479308 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6262,155 +6921,252 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 746487210997908662} - - component: {fileID: 7650660916348049875} + - component: {fileID: 872632105946418180} + - component: {fileID: 4741071075895732530} + - component: {fileID: 6370139117730400610} + - component: {fileID: 7938473658284279349} + - component: {fileID: 2229184091290522296} + - component: {fileID: 8841369047603809795} m_Layer: 0 - m_Name: Bucket Switcher + m_Name: Prism (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &746487210997908662 +--- !u!4 &872632105946418180 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2491348552388521466} + m_GameObject: {fileID: 3373537576598479308} 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_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 4.01, y: 6.28, z: 0.28} + m_LocalScale: {x: 0.53999996, y: 0.7900001, z: 0.59} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4285832540389516063} - - {fileID: 3486789976817481892} - - {fileID: 4426728696042940828} - - {fileID: 8403946452199375258} - - {fileID: 7259074507297002687} - - {fileID: 1871122324605241164} - - {fileID: 8018555868119998615} - - {fileID: 5271847991484246754} - - {fileID: 860234554731157289} - - {fileID: 8530902368550358140} - - {fileID: 6039025064665309388} - - {fileID: 6325235137861599459} - - {fileID: 3832213890724612316} - - {fileID: 1965222229307729085} - - {fileID: 2702872153647452578} - - {fileID: 3958117705110722027} - - {fileID: 6495008255651215659} - - {fileID: 2647251505547869332} - - {fileID: 2745699299756847182} - - {fileID: 3712729501977518319} - - {fileID: 7705725927872479511} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7650660916348049875 + m_Children: [] + m_Father: {fileID: 7734060114670211816} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!114 &4741071075895732530 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3373537576598479308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MeshFormatVersion: 2 + m_Faces: + - m_Indexes: 020000000100000000000000 + m_SmoothingGroup: 0 + m_Uv: + m_UseWorldSpace: 0 + m_FlipU: 0 + m_FlipV: 0 + m_SwapUV: 0 + m_Fill: 1 + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Rotation: 0 + m_Anchor: 9 + m_Material: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SubmeshIndex: 0 + m_ManualUV: 0 + elementGroup: 0 + m_TextureGroup: -1 + - m_Indexes: 050000000400000003000000050000000600000004000000 + m_SmoothingGroup: 0 + m_Uv: + m_UseWorldSpace: 0 + m_FlipU: 0 + m_FlipV: 0 + m_SwapUV: 0 + m_Fill: 1 + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Rotation: 0 + m_Anchor: 9 + m_Material: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SubmeshIndex: 0 + m_ManualUV: 0 + elementGroup: 0 + m_TextureGroup: -1 + - m_Indexes: 090000000800000007000000 + m_SmoothingGroup: 0 + m_Uv: + m_UseWorldSpace: 0 + m_FlipU: 0 + m_FlipV: 0 + m_SwapUV: 0 + m_Fill: 1 + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Rotation: 0 + m_Anchor: 9 + m_Material: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SubmeshIndex: 0 + m_ManualUV: 0 + elementGroup: 0 + m_TextureGroup: -1 + - m_Indexes: 0c0000000b0000000a0000000c0000000d0000000b000000 + m_SmoothingGroup: 0 + m_Uv: + m_UseWorldSpace: 0 + m_FlipU: 0 + m_FlipV: 0 + m_SwapUV: 0 + m_Fill: 1 + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Rotation: 0 + m_Anchor: 9 + m_Material: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SubmeshIndex: 0 + m_ManualUV: 0 + elementGroup: 0 + m_TextureGroup: -1 + - m_Indexes: 0e0000000f000000100000000f0000001100000010000000 + m_SmoothingGroup: 0 + m_Uv: + m_UseWorldSpace: 0 + m_FlipU: 0 + m_FlipV: 0 + m_SwapUV: 0 + m_Fill: 1 + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Rotation: 0 + m_Anchor: 9 + m_Material: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SubmeshIndex: 0 + m_ManualUV: 0 + elementGroup: 0 + m_TextureGroup: -1 + m_SharedVertices: + - m_Vertices: 000000000b0000000e000000 + - m_Vertices: 01000000030000000f000000 + - m_Vertices: 02000000050000000d000000 + - m_Vertices: 040000000700000011000000 + - m_Vertices: 06000000090000000c000000 + - m_Vertices: 080000000a00000010000000 + m_SharedTextures: [] + m_Positions: + - {x: -0.5, y: -0.5, z: -0.5} + - {x: 0.5, y: -0.5, z: -0.5} + - {x: 0, y: 0.5, z: -0.5} + - {x: 0.5, y: -0.5, z: -0.5} + - {x: 0.5, y: -0.5, z: 0.5} + - {x: 0, y: 0.5, z: -0.5} + - {x: 0, y: 0.5, z: 0.5} + - {x: 0.5, y: -0.5, z: 0.5} + - {x: -0.5, y: -0.5, z: 0.5} + - {x: 0, y: 0.5, z: 0.5} + - {x: -0.5, y: -0.5, z: 0.5} + - {x: -0.5, y: -0.5, z: -0.5} + - {x: 0, y: 0.5, z: 0.5} + - {x: 0, y: 0.5, z: -0.5} + - {x: -0.5, y: -0.5, z: -0.5} + - {x: 0.5, y: -0.5, z: -0.5} + - {x: -0.5, y: -0.5, z: 0.5} + - {x: 0.5, y: -0.5, z: 0.5} + m_Textures0: + - {x: -0.5, y: -0.5} + - {x: 0.5, y: -0.5} + - {x: 0, y: 0.5} + - {x: -0.5, y: -0.67082036} + - {x: 0.5, y: -0.67082036} + - {x: -0.5, y: 0.4472136} + - {x: 0.5, y: 0.4472136} + - {x: -0.5, y: -0.5} + - {x: 0.5, y: -0.5} + - {x: 0, y: 0.5} + - {x: -0.5, y: -0.67082036} + - {x: 0.5, y: -0.67082036} + - {x: -0.5, y: 0.4472136} + - {x: 0.5, y: 0.4472136} + - {x: 0.5, y: -0.5} + - {x: -0.5, y: -0.5} + - {x: 0.5, y: 0.5} + - {x: -0.5, y: 0.5} + m_Textures2: [] + m_Textures3: [] + m_Tangents: + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + m_Colors: [] + m_UnwrapParameters: + m_HardAngle: 88 + m_PackMargin: 20 + m_AngleError: 8 + m_AreaError: 15 + m_PreserveMeshAssetOnDestroy: 0 + assetGuid: + m_Mesh: {fileID: 0} + m_VersionIndex: 4259 + m_IsSelectable: 1 + m_SelectedFaces: + m_SelectedEdges: [] + m_SelectedVertices: +--- !u!114 &6370139117730400610 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2491348552388521466} + m_GameObject: {fileID: 3373537576598479308} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c51b7c66d710db348a5f4d4667500ec2, type: 3} + m_Script: {fileID: 11500000, guid: 1ca002da428252441b92f28d83c8a65f, type: 3} m_Name: m_EditorClassIdentifier: - TileIDNum: 0 - _game: {fileID: 3651332649757162098} - _suddenDeath: {fileID: 7325491386596941882} - _cleaningBarController: {fileID: 5085424688749015081} - _releaseBar: {fileID: 3486789976817481892} - _tileNameText: {fileID: 88268596640976697} - _rarityText: {fileID: 6965428202780938223} - _timerText: {fileID: 5961916702511309131} - _ticketBonusAmountText: {fileID: 7424343479445784218} - TicketBonusAmount: 0 - TileState: 0 - RarityType: 0 - DurationTYpe: 0 - IsGolden: 0 - IsShop: 0 - _cycleMode: 2 - _updateCycleModeButton: 0 - _contactWarp: {fileID: 2221752522102408061} - _resetablesRoot: {fileID: 2702872153647452578} - _background: {fileID: 2532240964184548847} - _tileDurationS: 60 - MinAuctionSlots: 0 - MaxAuctionSlots: 8 - RaffleSlots: 8 - AuctionDuration: 15 - finishTileButton: 0 - EntrancePipe: {fileID: 3853338807257938560} - _goldenVisuals: {fileID: 105688910835791150} - _colorTrimsByRarity: - - {fileID: 6327524171554363783} - - {fileID: 5905202177163288322} - - {fileID: 1319270291859773841} - - {fileID: 3360055215466819110} - - {fileID: 7091515534910087112} - ConveyorBelt: [] - _backgroundStartColor: {r: 0, g: 0, b: 0, a: 0} - _backgroundEndColor: {r: 0, g: 0, b: 0, a: 0} - _trimColor: {r: 0, g: 0, b: 0, a: 0} - Effectors: [] - CurrentSide: 2 - Players: [] - AlivePlayers: [] - EliminatedPlayers: [] - _waitForAll: 0 - _waitForAllDead: 1 ---- !u!1 &2664301243833230550 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3832213890724612316} - - component: {fileID: 2638478161653049529} - - component: {fileID: 7424343479445784218} - m_Layer: 0 - m_Name: WinPrizeText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3832213890724612316 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2664301243833230550} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.646} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 746487210997908662} - 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: -2.94, y: 9.47} - m_SizeDelta: {x: 4, y: 0.74} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &2638478161653049529 + m_Shape: + rid: 7705887902649025520 + m_Size: {x: 1, y: 1, z: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_PivotLocation: 0 + m_PivotPosition: {x: 0, y: 0, z: 0} + m_UnmodifiedMeshVersion: 4259 + m_ShapeBox: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 0.5} + references: + version: 2 + RefIds: + - rid: 7705887902649025520 + type: {class: Prism, ns: UnityEngine.ProBuilder.Shapes, asm: Unity.ProBuilder} + data: +--- !u!23 &7938473658284279349 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2664301243833230550} + m_GameObject: {fileID: 3373537576598479308} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 @@ -6421,7 +7177,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6434,7 +7190,7 @@ MeshRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 + m_SelectedEditorRenderState: 2 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -6443,100 +7199,62 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7424343479445784218 -MonoBehaviour: +--- !u!33 &2229184091290522296 +MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2664301243833230550} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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: 'Win Prize: 1345' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 4.9 - m_fontSizeBase: 9.67 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 0 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2638478161653049529} - m_maskType: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3373537576598479308} + m_Mesh: {fileID: 0} +--- !u!60 &8841369047603809795 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3373537576598479308} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 2b2467b94baf94546a1257c3affbaebd, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0, y: 0.5} + - {x: -0.5, y: -0.5} + - {x: 0.5, y: -0.5} + m_UseDelaunayMesh: 0 --- !u!1 &3432122979537866359 GameObject: m_ObjectHideFlags: 0 @@ -7530,7 +8248,7 @@ GameObject: m_Component: - component: {fileID: 2745699299756847182} m_Layer: 0 - m_Name: First Part + m_Name: Second Part m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7545,11 +8263,10 @@ Transform: m_GameObject: {fileID: 4975646152257657919} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.42870018, y: -0.46845537, z: -4.49753} + m_LocalPosition: {x: -0.42870018, y: -2.63, z: -4.49753} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7075193771510971556} - {fileID: 4161765309126764002} - {fileID: 3231756986082195361} m_Father: {fileID: 746487210997908662} @@ -7906,7 +8623,7 @@ GameObject: m_Component: - component: {fileID: 3712729501977518319} m_Layer: 0 - m_Name: Second Part + m_Name: Third Part m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7925,7 +8642,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2918864969543992879} - {fileID: 7469926493308645762} - {fileID: 1069213352093525853} m_Father: {fileID: 746487210997908662} @@ -13845,11 +14561,286 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 3712729501977518319} + m_TransformParent: {fileID: 3712729501977518319} + m_Modifications: + - target: {fileID: 8202413732556902, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 89289836227949916, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 198733809829394089, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _value + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 198733809829394089, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _effect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 435933497969762261, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 816720835561514289, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 955898351670774402, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1052647226284147622, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _value + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 1052647226284147622, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _effect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1243877933797575132, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Name + value: BucketRow (1) + objectReference: {fileID: 0} + - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.x + value: -9.347684 + objectReference: {fileID: 0} + - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.y + value: 0.7984553 + objectReference: {fileID: 0} + - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 4.53753 + objectReference: {fileID: 0} + - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1341794963468766094, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2105990114058059124, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _value + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 2105990114058059124, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _effect + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2217681019111014017, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2810845713146070835, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3191528212859048548, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3272580564613781342, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 0.54 + objectReference: {fileID: 0} + - target: {fileID: 3480812452627126860, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _value + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 3480812452627126860, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _effect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3643829012493589635, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 4253336707757313819, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _value + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 4253336707757313819, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _effect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4524060876000160140, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 4596019487136999015, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5586353403376928098, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5873385134661750090, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _value + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5873385134661750090, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _effect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6513952693467918015, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 0.54 + objectReference: {fileID: 0} + - target: {fileID: 6532685879796167447, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 7048420251274192736, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 7653099011671737493, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _value + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7653099011671737493, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _effect + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 7708952294535534909, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _value + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 7708952294535534909, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: _effect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7820545484488809860, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8516737333072432317, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8574696732556284181, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} +--- !u!4 &1069213352093525853 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + m_PrefabInstance: {fileID: 2244141892877015186} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2539787521432139884 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2156181072557078925} + m_Modifications: + - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_LocalPosition.x + value: 1.0887003 + objectReference: {fileID: 0} + - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_LocalPosition.y + value: -2.96 + objectReference: {fileID: 0} + - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_LocalPosition.z + value: 4.77753 + objectReference: {fileID: 0} + - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6891425745409393222, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + propertyPath: m_Name + value: SpinningPegLayer (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 53737051278765724, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + insertIndex: -1 + addedObject: {fileID: 9017829543398357256} + - targetCorrespondingSourceObject: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + insertIndex: -1 + addedObject: {fileID: 872632105946418180} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dd9729d651b6be941a4c10875b47514e, type: 3} +--- !u!4 &7734060114670211816 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} + m_PrefabInstance: {fileID: 2539787521432139884} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3039168697849779684 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2156181072557078925} m_Modifications: - target: {fileID: 8202413732556902, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z - value: 0.54 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 89289836227949916, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_Enabled @@ -13857,7 +14848,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198733809829394089, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 20 + value: 10 objectReference: {fileID: 0} - target: {fileID: 198733809829394089, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect @@ -13869,7 +14860,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 816720835561514289, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z - value: 0.54 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 955898351670774402, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_IsActive @@ -13877,15 +14868,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1052647226284147622, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 20 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1052647226284147622, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 1 + value: 20 objectReference: {fileID: 0} - target: {fileID: 1243877933797575132, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_Name - value: BucketRow (1) + value: BucketRow objectReference: {fileID: 0} - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.x @@ -13893,7 +14884,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.y - value: 0.7984553 + value: 8.628455 objectReference: {fileID: 0} - target: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z @@ -13927,13 +14918,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1341794963468766094, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2105990114058059124, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 20 + value: 10 objectReference: {fileID: 0} - target: {fileID: 2105990114058059124, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect @@ -13943,6 +14930,14 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 2810845713146070835, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3191528212859048548, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3272580564613781342, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z value: 1.2 @@ -13953,7 +14948,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3480812452627126860, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 20 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3643829012493589635, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z @@ -13965,11 +14960,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4253336707757313819, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 20 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4524060876000160140, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z - value: 1.2 + value: 0.54 objectReference: {fileID: 0} - target: {fileID: 4596019487136999015, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_IsActive @@ -13981,7 +14976,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5873385134661750090, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 20 + value: 10 objectReference: {fileID: 0} - target: {fileID: 5873385134661750090, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect @@ -13993,7 +14988,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6532685879796167447, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z - value: 1.2 + value: 0.54 objectReference: {fileID: 0} - target: {fileID: 7048420251274192736, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z @@ -14001,7 +14996,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7653099011671737493, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 20 + value: 10 objectReference: {fileID: 0} - target: {fileID: 7653099011671737493, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect @@ -14009,11 +15004,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7708952294535534909, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 20 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7708952294535534909, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 1 + value: 20 objectReference: {fileID: 0} - target: {fileID: 7820545484488809860, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_IsActive @@ -14023,81 +15018,15 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 8574696732556284181, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} ---- !u!4 &1069213352093525853 stripped +--- !u!4 &4314196782397581867 stripped Transform: m_CorrespondingSourceObject: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} - m_PrefabInstance: {fileID: 2244141892877015186} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3052286911062627872 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 2745699299756847182} - m_Modifications: - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalPosition.x - value: 0.47870013 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalPosition.y - value: -0.8915445 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalPosition.z - value: 4.77753 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6891425745409393222, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_Name - value: SpinningPegLayer - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dd9729d651b6be941a4c10875b47514e, type: 3} ---- !u!4 &7075193771510971556 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - m_PrefabInstance: {fileID: 3052286911062627872} + m_PrefabInstance: {fileID: 3039168697849779684} m_PrefabAsset: {fileID: 0} --- !u!1001 &3441110105216588550 PrefabInstance: @@ -14113,7 +15042,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} propertyPath: m_LocalPosition.y - value: -9.621545 + value: -10.58 objectReference: {fileID: 0} - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} propertyPath: m_LocalPosition.z @@ -14178,7 +15107,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8202413732556902, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z - value: 1.2 + value: 0.54 objectReference: {fileID: 0} - target: {fileID: 89289836227949916, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_Enabled @@ -14186,7 +15115,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198733809829394089, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 10 + value: 20 objectReference: {fileID: 0} - target: {fileID: 198733809829394089, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect @@ -14198,7 +15127,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 816720835561514289, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z - value: 1.2 + value: 0.54 objectReference: {fileID: 0} - target: {fileID: 955898351670774402, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_IsActive @@ -14206,11 +15135,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1052647226284147622, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 5 + value: 20 objectReference: {fileID: 0} - target: {fileID: 1052647226284147622, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 20 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1243877933797575132, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_Name @@ -14256,9 +15185,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1341794963468766094, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2105990114058059124, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 10 + value: 20 objectReference: {fileID: 0} - target: {fileID: 2105990114058059124, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect @@ -14286,7 +15219,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3480812452627126860, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 1 + value: 20 objectReference: {fileID: 0} - target: {fileID: 3643829012493589635, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z @@ -14298,11 +15231,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4253336707757313819, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 1 + value: 20 objectReference: {fileID: 0} - target: {fileID: 4524060876000160140, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z - value: 0.54 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 4596019487136999015, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_IsActive @@ -14314,7 +15247,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5873385134661750090, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 10 + value: 20 objectReference: {fileID: 0} - target: {fileID: 5873385134661750090, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect @@ -14326,7 +15259,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6532685879796167447, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z - value: 0.54 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 7048420251274192736, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_LocalPosition.z @@ -14334,7 +15267,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7653099011671737493, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 10 + value: 20 objectReference: {fileID: 0} - target: {fileID: 7653099011671737493, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect @@ -14342,11 +15275,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7708952294535534909, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value - value: 5 + value: 20 objectReference: {fileID: 0} - target: {fileID: 7708952294535534909, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _effect - value: 20 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7820545484488809860, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_IsActive @@ -14356,6 +15289,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 8574696732556284181, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -14366,68 +15303,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1293184870014681039, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} m_PrefabInstance: {fileID: 4407846538067478638} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6983431281992379563 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3712729501977518319} - m_Modifications: - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalPosition.x - value: 0.47870013 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalPosition.y - value: -8.371544 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalPosition.z - value: 4.77753 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6891425745409393222, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - propertyPath: m_Name - value: SpinningPegLayer (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dd9729d651b6be941a4c10875b47514e, type: 3} ---- !u!4 &2918864969543992879 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} - m_PrefabInstance: {fileID: 6983431281992379563} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8190440813802196838 PrefabInstance: m_ObjectHideFlags: 0 @@ -14442,7 +15317,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} propertyPath: m_LocalPosition.y - value: -2.1415448 + value: -2.96 objectReference: {fileID: 0} - target: {fileID: 5218482270058441348, guid: dd9729d651b6be941a4c10875b47514e, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scripts/Games/BucketSwitcherGame.cs b/Assets/Scripts/Games/BucketSwitcherGame.cs index 58925195..3dd1c52e 100644 --- a/Assets/Scripts/Games/BucketSwitcherGame.cs +++ b/Assets/Scripts/Games/BucketSwitcherGame.cs @@ -84,19 +84,19 @@ private IEnumerator RunGame() private void SwitchEffectors() { - _currState++; - if (_currState >= 4) - _currState = 0; + _currState = (_currState + 1) % 4; for (int i = 0; i < _gt.Effectors.Length; i++) { PBEffector effector = _gt.Effectors[i]; int workState = _currState; - if (i >= _gt.Effectors.Length / 2) - workState++; - if (workState >= 4) - workState = 0; + + int rowIndex = i/8; + workState += rowIndex; + + // Wrap the value to be 0, 1, 2 or 3 + workState = workState % 4; if (i % 4 == workState) { @@ -152,8 +152,10 @@ public override void CleanUpGame() for (int i = 0; i < _gt.Effectors.Length; i++) { int workState = 0; - if (i >= _gt.Effectors.Length / 2) - workState++; + int rowIndex = i/8; + workState += rowIndex; + + workState = workState % 4; PBEffector effector = _gt.Effectors[i]; effector.ResetValue(false); From 05f21cda99405ec2de3f872f9d36bef83aec3269 Mon Sep 17 00:00:00 2001 From: 5jiji Date: Tue, 27 Feb 2024 13:33:26 +0100 Subject: [PATCH 4/5] Fix Bugs --- .../AllRarities/Bucket Switcher.prefab | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab b/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab index 5f0f3d2e..d1bd447c 100644 --- a/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab +++ b/Assets/Prefabs/GameTiles/AllRarities/Bucket Switcher.prefab @@ -14918,6 +14918,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1341794963468766094, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1548096728018850217, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1564164700108573697, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2105990114058059124, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value value: 10 @@ -14942,6 +14954,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 1.2 objectReference: {fileID: 0} + - target: {fileID: 3372281791594797174, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3480812452627126860, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value value: 10 @@ -14970,10 +14986,18 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4920279307279227431, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5586353403376928098, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 5692797037834981232, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5873385134661750090, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value value: 10 @@ -14994,6 +15018,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 1.2 objectReference: {fileID: 0} + - target: {fileID: 7095225622309267528, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7653099011671737493, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: _value value: 10 @@ -15014,10 +15042,22 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8202591860294932122, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8516737333072432317, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 8574696732556284181, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9046816434955084693, guid: 84c301c90f5a0d74495dd4e93a8ffe19, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] From d1d84cea72982adcc7622fc84d0856a2a7cdc4fd Mon Sep 17 00:00:00 2001 From: doodlechaos Date: Wed, 28 Feb 2024 17:07:49 -0600 Subject: [PATCH 5/5] Fixed bug found by @5jiji where httpserver could receive non-local requests for auth --- Assets/Scripts/Networking/MyHttpServerV2.cs | 35 +++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/Assets/Scripts/Networking/MyHttpServerV2.cs b/Assets/Scripts/Networking/MyHttpServerV2.cs index b00d5604..8689282f 100644 --- a/Assets/Scripts/Networking/MyHttpServerV2.cs +++ b/Assets/Scripts/Networking/MyHttpServerV2.cs @@ -257,6 +257,18 @@ private async Task GetResponseData(HttpListenerRequest request) if(request.Url.LocalPath == "/authCallback") { + if (!request.IsLocal) + return Encoding.UTF8.GetBytes(@" + + + + OAuth Callback + + + Unauthorized. + + "); + Debug.Log("Inside /authCallback"); return Encoding.UTF8.GetBytes(@" @@ -282,6 +294,17 @@ Processing authentication... if (request.Url.LocalPath == "/receiveBotAuthCode") { + if (!request.IsLocal) + return Encoding.UTF8.GetBytes(@" + + + + OAuth Callback + + + Unauthorized. + + "); Debug.Log($"inside receivebotauthcode. request RawUrl: {request.RawUrl}"); @@ -303,6 +326,18 @@ Processing authentication... } if (request.Url.LocalPath == "/spotifyToken") // Receive NGROK signal /TODO: Change this path to specify [/updatePlayerFromDB] { + if (!request.IsLocal) + return Encoding.UTF8.GetBytes(@" + + + + OAuth Callback + + + Unauthorized. + + "); + string code = request.QueryString.Get("code");//parsedPostData["code"]; Debug.Log($"Received spotify code: {code}. Now using this code to request access token"); using (var client = new HttpClient())