diff --git a/Assets/AchievementSystem/Scripts/AchievementManager.cs b/Assets/AchievementSystem/Scripts/AchievementManager.cs
index b02de79a..83e2521c 100644
--- a/Assets/AchievementSystem/Scripts/AchievementManager.cs
+++ b/Assets/AchievementSystem/Scripts/AchievementManager.cs
@@ -159,36 +159,25 @@ public class AchievementManager : MonoBehaviour
/// Fully unlocks a progression or goal achievement.
///
/// The index of the achievement to be unlocked
- public void ButtonSetterForUnlockedAcheivement(int index)
- {
- Debug.Log("ButtonSetterForUnlockedAcheivement");
- int numOfCoins = AchievementList[index].TotalCoinReward;
- //int numOfCoins = AchievementList[index].CoinRewards[AchievementList[index].SubAchievementIndex];
- achievementListIngame.Stack[index].ClaimButton.gameObject.SetActive(true);
- achievementListIngame.Stack[index].ClaimButton.onClick.AddListener(() => AddCoins(numOfCoins));
- achievementListIngame.Stack[index].CompleteToClaimButton.SetActive(false);
- }
public void Unlock(int Index)
{
if (!States[Index].Achieved)
{
- //ButtonSetterForUnlockedAcheivement(Index);
-
- //ClaimRewardButton.onClick.AddListener(() => AddCoins(numOfCoins));
- // Set current progress to the achievement's progress goal
States[Index].Progress = AchievementList[Index].ProgressGoal;
-
var achievementInfromation = AchievementList[Index];
States[Index].LastProgressGoal = achievementInfromation.ProgressGoal;
+
+ #region Ali's Code for Reward
+
PlayerPrefs.SetInt("UIAchievement" + Index + "Claimable", 1);
int numOfPrevCoins = PlayerPrefs.GetInt("TotalCoinsForReward" + Index, 0);
-
int subAchievementIndex = PlayerPrefs.GetInt("subAchievementIndex" + Index, 0);
- Debug.Log("SubAchievementIndex for " + Index + ": " + subAchievementIndex);
PlayerPrefs.SetInt("TotalCoinsForReward" + Index, numOfPrevCoins + achievementInfromation.CoinRewards[Mathf.Clamp(subAchievementIndex,0, achievementInfromation.CoinRewards.Count-1)]);
subAchievementIndex++;
PlayerPrefs.SetInt("subAchievementIndex" + Index, subAchievementIndex);
-
+
+ #endregion
+
achievementInfromation.ProgressGoal += 5;
// Check if the new progress goal has reached or exceeded 50
if (AchievementList[Index].ProgressGoal >= 50)
@@ -212,10 +201,6 @@ public class AchievementManager : MonoBehaviour
}
}
}
- else
- {
- ButtonSetterForUnlockedAcheivement(Index);
- }
}
///
diff --git a/Assets/AchievementSystem/Scripts/AchievenmentListIngame.cs b/Assets/AchievementSystem/Scripts/AchievenmentListIngame.cs
index c0a7971b..c9e50787 100644
--- a/Assets/AchievementSystem/Scripts/AchievenmentListIngame.cs
+++ b/Assets/AchievementSystem/Scripts/AchievenmentListIngame.cs
@@ -56,16 +56,6 @@ public class AchievenmentListIngame : MonoBehaviour
UIAchievement.Set(Achievement, State);
UIAchievement.transform.SetParent(scrollContent.transform);
UIAchievement.GetComponent().localScale = Vector3.one;
- //if (Achievement.TotalCoinReward > 0)
- //{
- // UIAchievement.ClaimButton.gameObject.SetActive(true);
- // UIAchievement.CompleteToClaimButton.SetActive(false);
- // int numOfCoins = Achievement.TotalCoinReward;
- // //int numOfCoins = AchievementList[index].CoinRewards[AchievementList[index].SubAchievementIndex];
- // UIAchievement.ClaimButton.onClick.RemoveAllListeners();
- // UIAchievement.ClaimButton.onClick.AddListener(() => AchievementManager.instance.AddCoins(numOfCoins));
- //}
-
}
///
/// Filter out a set of locked or unlocked achievements
@@ -121,8 +111,6 @@ public class AchievenmentListIngame : MonoBehaviour
AchievementManager.instance.AddCoins(numofCoinsToAdd);
PlayerPrefs.SetInt("TotalCoinsForReward" + i, 0);
});
-
-
}
}
}
diff --git a/Assets/PipeOut/Scenes/GameScene.unity b/Assets/PipeOut/Scenes/GameScene.unity
index db8d1481..fb8e7342 100644
--- a/Assets/PipeOut/Scenes/GameScene.unity
+++ b/Assets/PipeOut/Scenes/GameScene.unity
@@ -13886,6 +13886,24 @@ MonoBehaviour:
- {fileID: 1790415148045804967, guid: 229977167f576444c95a3de9481d3736, type: 3}
- {fileID: 1790415148045804986, guid: fe1e244065d3da94681c0864a1c81d9e, type: 3}
- {fileID: 1790415148045804980, guid: 9e1b116d5135cfb4e8bb23dd1c21a2b2, type: 3}
+ - _cellPrefab:
+ - {fileID: 1790415148045804981, guid: b38e9dee6c633a94cbdc5092e919cf5f, type: 3}
+ - {fileID: 1790415148045804992, guid: fa277f2ba3797bf41b83d8339c2d34a5, type: 3}
+ - {fileID: 1790415148045804987, guid: feece6daf44071d479ed1363d442f2ef, type: 3}
+ - {fileID: 1790415148045804970, guid: 0747e0a19a18b164d8cc279b00b325ea, type: 3}
+ - {fileID: 1790415148045804983, guid: c0e515e59510eee43a63e87f7d5c36b8, type: 3}
+ - {fileID: 1790415148045804967, guid: f99a0fe61ec5b554e86233db9d8c00da, type: 3}
+ - {fileID: 1790415148045804986, guid: 4ffef33b6a0360447983c911271b6654, type: 3}
+ - {fileID: 1790415148045804980, guid: 6fa678a7592d62947876343ea2c958c7, type: 3}
+ - _cellPrefab:
+ - {fileID: 1790415148045804981, guid: d2283fe8ba11d0e4185cd7ff980c8c8b, type: 3}
+ - {fileID: 1790415148045804992, guid: 60b3d057d203e544e90b634d61440bcd, type: 3}
+ - {fileID: 1790415148045804987, guid: ef233d89ba4b7a54e88e67178b99f9e5, type: 3}
+ - {fileID: 1790415148045804970, guid: b5d1bc4bcf1c14940bfa48b6738d0594, type: 3}
+ - {fileID: 1790415148045804983, guid: 65f052ecdfa6421458a82882ebf0fc72, type: 3}
+ - {fileID: 1790415148045804967, guid: e6476069682b24a4188fcb200b470879, type: 3}
+ - {fileID: 1790415148045804986, guid: 95087e92ed4e4cf4a9e7a83c0fe8b902, type: 3}
+ - {fileID: 1790415148045804980, guid: 3b7945d8a265b17459be859a428a9df5, type: 3}
menuPopup: {fileID: 1790415148045805215}
gameOverPopup: {fileID: 1790415148045805174}
rankedUpPopup: {fileID: 1040638927}
diff --git a/Assets/PipeOut/Scenes/HomeScene.unity b/Assets/PipeOut/Scenes/HomeScene.unity
index d6e66870..38df8ab8 100644
--- a/Assets/PipeOut/Scenes/HomeScene.unity
+++ b/Assets/PipeOut/Scenes/HomeScene.unity
@@ -1076,6 +1076,93 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 27920171}
m_CullTransparentMesh: 1
+--- !u!21 &34160551
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: 2DxFX/Standard/GrayScale
+ m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _Alpha: 0
+ - _ColorMask: 15
+ - _EffectAmount: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
+--- !u!21 &34185694
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: 2DxFX/Standard/Shiny_Reflect
+ m_Shader: {fileID: 4800000, guid: 6fc94ae14d17d3642b09718b5b932fd2, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex2:
+ m_Texture: {fileID: 2800000, guid: 6ed1aafd335608e48aa3198044a161df, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _Alpha: 0
+ - _ColorMask: 15
+ - _Distortion: -0.2369591
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _Value2: 0.5
+ - _Value3: 1
+ - _Value4: 0
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
--- !u!1 &35754329
GameObject:
m_ObjectHideFlags: 0
@@ -3176,6 +3263,46 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 139740151}
m_CullTransparentMesh: 1
+--- !u!21 &150946267
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: 2DxFX/Standard/GrayScale
+ m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _Alpha: 0
+ - _ColorMask: 15
+ - _EffectAmount: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
--- !u!1 &163536049
GameObject:
m_ObjectHideFlags: 0
@@ -3291,7 +3418,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 194, y: -209.5}
+ m_AnchoredPosition: {x: 209.5, y: -209.5}
m_SizeDelta: {x: 326, y: 419}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &172872626
@@ -5823,6 +5950,46 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 287624911}
m_PrefabAsset: {fileID: 0}
+--- !u!21 &281944434
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: 2DxFX/Standard/GrayScale
+ m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _Alpha: 0
+ - _ColorMask: 15
+ - _EffectAmount: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
--- !u!1001 &287624911
PrefabInstance:
m_ObjectHideFlags: 0
@@ -7496,7 +7663,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 488.80017}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &347307607
@@ -8835,8 +9002,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 42.550003}
- m_SizeDelta: {x: 0, y: -85.09999}
+ m_AnchoredPosition: {x: 0, y: 30}
+ m_SizeDelta: {x: 0, y: -59.999996}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &404524446
MonoBehaviour:
@@ -8858,7 +9025,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: Pipe 1
+ m_text: Pipe 3
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f9650ff3b67d45e42aa51501d10136f4, type: 2}
m_sharedMaterial: {fileID: 2039440194532944411, guid: f9650ff3b67d45e42aa51501d10136f4,
@@ -10275,7 +10442,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 550664bcf96071b4d91397629eec19d5, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 61489eeacbeda884895504ac89bb5804, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -14151,8 +14318,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 42.550003}
- m_SizeDelta: {x: 0, y: -85.09999}
+ m_AnchoredPosition: {x: 0, y: 30}
+ m_SizeDelta: {x: 0, y: -59.999996}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &749893268
MonoBehaviour:
@@ -14174,7 +14341,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: Pipe 1
+ m_text: Pipe 2
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f9650ff3b67d45e42aa51501d10136f4, type: 2}
m_sharedMaterial: {fileID: 2039440194532944411, guid: f9650ff3b67d45e42aa51501d10136f4,
@@ -14483,7 +14650,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 550664bcf96071b4d91397629eec19d5, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3d812b1f7d012a545b2d61f9dd9b6b1e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -15899,53 +16066,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 818669805}
m_CullTransparentMesh: 1
---- !u!21 &820857054
-Material:
- serializedVersion: 8
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: 2DxFX/Standard/Shiny_Reflect
- m_Shader: {fileID: 4800000, guid: 6fc94ae14d17d3642b09718b5b932fd2, type: 3}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_LockedProperties:
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MainTex2:
- m_Texture: {fileID: 2800000, guid: 6ed1aafd335608e48aa3198044a161df, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Ints: []
- m_Floats:
- - _Alpha: 0
- - _ColorMask: 15
- - _Distortion: 1.0760962
- - _Stencil: 0
- - _StencilComp: 8
- - _StencilOp: 0
- - _StencilReadMask: 255
- - _StencilWriteMask: 255
- - _Value2: 0.261
- - _Value3: 0.53
- - _Value4: 0
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- m_BuildTextureStacks: []
--- !u!1 &820927357
GameObject:
m_ObjectHideFlags: 0
@@ -16108,11 +16228,12 @@ RectTransform:
- {fileID: 491212895}
- {fileID: 672771274}
- {fileID: 1962511984}
+ - {fileID: 1367667167}
m_Father: {fileID: 1498741825}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 886, y: -690.47}
+ m_AnchoredPosition: {x: 901.5, y: -690.47}
m_SizeDelta: {x: 326, y: 419}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &834114142
@@ -16153,6 +16274,53 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 834114140}
m_CullTransparentMesh: 1
+--- !u!21 &838650443
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: 2DxFX/Standard/Shiny_Reflect
+ m_Shader: {fileID: 4800000, guid: 6fc94ae14d17d3642b09718b5b932fd2, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex2:
+ m_Texture: {fileID: 2800000, guid: 6ed1aafd335608e48aa3198044a161df, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _Alpha: 0
+ - _ColorMask: 15
+ - _Distortion: -0.09439519
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _Value2: 0.261
+ - _Value3: 0.53
+ - _Value4: 0
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
--- !u!1 &843809875
GameObject:
m_ObjectHideFlags: 0
@@ -17342,8 +17510,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 42.550003}
- m_SizeDelta: {x: 0, y: -85.09999}
+ m_AnchoredPosition: {x: 0, y: 30}
+ m_SizeDelta: {x: 0, y: -59.999996}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &878112943
MonoBehaviour:
@@ -17365,7 +17533,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: Pipe 1
+ m_text: Pipe 5
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f9650ff3b67d45e42aa51501d10136f4, type: 2}
m_sharedMaterial: {fileID: 2039440194532944411, guid: f9650ff3b67d45e42aa51501d10136f4,
@@ -18130,7 +18298,7 @@ MonoBehaviour:
- m_Target: {fileID: 1546842700}
m_TargetAssemblyTypeName: MS.Popup, Assembly-CSharp
m_MethodName: Close
- m_Mode: 6
+ m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -19615,7 +19783,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 550664bcf96071b4d91397629eec19d5, type: 3}
+ m_Sprite: {fileID: 21300000, guid: dfb0374bbfb054e428c3d60e9ca18efe, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -22181,6 +22349,46 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1134389555}
m_CullTransparentMesh: 1
+--- !u!21 &1136698212
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: 2DxFX/Standard/GrayScale
+ m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _Alpha: 0
+ - _ColorMask: 15
+ - _EffectAmount: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
--- !u!114 &1139401406
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -23643,6 +23851,46 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1192910357}
m_PrefabAsset: {fileID: 0}
+--- !u!21 &1194794930
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: 2DxFX/Standard/GrayScale
+ m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _Alpha: 0
+ - _ColorMask: 15
+ - _EffectAmount: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
--- !u!1 &1200108432
GameObject:
m_ObjectHideFlags: 0
@@ -25324,8 +25572,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1900893651}
m_HandleRect: {fileID: 1900893650}
m_Direction: 2
- m_Value: 0.49017465
- m_Size: 0.5967462
+ m_Value: 1
+ m_Size: 0.59674627
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -26110,7 +26358,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 540, y: -209.5}
+ m_AnchoredPosition: {x: 555.5, y: -209.5}
m_SizeDelta: {x: 326, y: 419}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1281964638
@@ -26419,7 +26667,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 1749802848}
+ m_Material: {fileID: 34185694}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -26584,8 +26832,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 42.550003}
- m_SizeDelta: {x: 0, y: -85.09999}
+ m_AnchoredPosition: {x: 0, y: 30}
+ m_SizeDelta: {x: 0, y: -59.999996}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1296548342
MonoBehaviour:
@@ -26607,7 +26855,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: Pipe 1
+ m_text: Pipe 4
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f9650ff3b67d45e42aa51501d10136f4, type: 2}
m_sharedMaterial: {fileID: 2039440194532944411, guid: f9650ff3b67d45e42aa51501d10136f4,
@@ -27982,7 +28230,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 540, y: -690.47}
+ m_AnchoredPosition: {x: 555.5, y: -690.47}
m_SizeDelta: {x: 326, y: 419}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1358291108
@@ -28308,6 +28556,141 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1365164482}
m_CullTransparentMesh: 1
+--- !u!1 &1367667166
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1367667167}
+ - component: {fileID: 1367667169}
+ - component: {fileID: 1367667168}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1367667167
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1367667166}
+ 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: 834114141}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1367667168
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1367667166}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: Coming Soon
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
+ m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80,
+ type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4278190080
+ m_fontColor: {r: 0, g: 0, b: 0, 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: 72
+ m_fontSizeBase: 36
+ m_fontWeight: 400
+ m_enableAutoSizing: 1
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ 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_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1367667169
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1367667166}
+ m_CullTransparentMesh: 1
--- !u!1 &1375396418
GameObject:
m_ObjectHideFlags: 0
@@ -29076,7 +29459,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1412236277
RectTransform:
m_ObjectHideFlags: 0
@@ -29309,7 +29692,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 886, y: -209.5}
+ m_AnchoredPosition: {x: 901.5, y: -209.5}
m_SizeDelta: {x: 326, y: 419}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1422877297
@@ -31294,7 +31677,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
- m_ChildAlignment: 0
+ m_ChildAlignment: 1
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 326, y: 419}
@@ -31712,7 +32095,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 550664bcf96071b4d91397629eec19d5, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 95b0e6838270178439dd4915b604069f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -31889,6 +32272,7 @@ MonoBehaviour:
CountText: {fileID: 0}
CompleteText: {fileID: 0}
Scrollbar: {fileID: 26138665}
+ Stack: []
--- !u!1 &1541805231
GameObject:
m_ObjectHideFlags: 0
@@ -32133,13 +32517,13 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 12202565}
- - {fileID: 1543467230}
- {fileID: 1804766843}
- {fileID: 1891858551}
- {fileID: 1065494041}
- {fileID: 1181078827}
- {fileID: 260639732}
- {fileID: 179992397}
+ - {fileID: 1543467230}
m_Father: {fileID: 1790415148045805308}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -32781,8 +33165,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 42.550003}
- m_SizeDelta: {x: 0, y: -85.09999}
+ m_AnchoredPosition: {x: 0, y: 30}
+ m_SizeDelta: {x: 0, y: -59.999996}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1618977190
MonoBehaviour:
@@ -34676,7 +35060,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 820857054}
+ m_Material: {fileID: 838650443}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -34988,7 +35372,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 550664bcf96071b4d91397629eec19d5, type: 3}
+ m_Sprite: {fileID: 21300000, guid: d073848b0c63b904dbcfc8800803214e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -35353,53 +35737,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1745464065}
m_CullTransparentMesh: 1
---- !u!21 &1749802848
-Material:
- serializedVersion: 8
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: 2DxFX/Standard/Shiny_Reflect
- m_Shader: {fileID: 4800000, guid: 6fc94ae14d17d3642b09718b5b932fd2, type: 3}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_LockedProperties:
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MainTex2:
- m_Texture: {fileID: 2800000, guid: 6ed1aafd335608e48aa3198044a161df, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Ints: []
- m_Floats:
- - _Alpha: 0
- - _ColorMask: 15
- - _Distortion: 1.1414776
- - _Stencil: 0
- - _StencilComp: 8
- - _StencilOp: 0
- - _StencilReadMask: 255
- - _StencilWriteMask: 255
- - _Value2: 0.5
- - _Value3: 1
- - _Value4: 0
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- m_BuildTextureStacks: []
--- !u!1 &1752682036
GameObject:
m_ObjectHideFlags: 0
@@ -38705,7 +39042,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1962511984
RectTransform:
m_ObjectHideFlags: 0
@@ -39504,7 +39841,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 194, y: -690.47}
+ m_AnchoredPosition: {x: 209.5, y: -690.47}
m_SizeDelta: {x: 326, y: 419}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2020170880