Updates push
Tahir-branch
TG9six 2 months ago
parent b4016f0980
commit 7dc881bc65

@ -32,7 +32,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}

@ -32,7 +32,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}

@ -38,7 +38,6 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.07500453, g: 0.13855189, b: 0.6787524, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -147,13 +146,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 74445105}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &74445108
MonoBehaviour:
@ -194,13 +193,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 159239762}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &437365063
PrefabInstance:
@ -307,13 +306,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 502168396}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.1610093, y: -10.442141, z: 21.329115}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &779233195 stripped
Transform:
@ -361,13 +360,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 859659599}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &859659602
MonoBehaviour:
@ -404,13 +403,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 921923542}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1302773985
PrefabInstance:
@ -496,13 +495,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1533045681}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1971612941
GameObject:
@ -527,13 +526,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1971612941}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1912088910611789087
PrefabInstance:
@ -1039,3 +1038,20 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bfaeed965dc69d74dbd0b97fe9ea7476, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1912088910611789087}
- {fileID: 921923543}
- {fileID: 159239763}
- {fileID: 8828233118980391471}
- {fileID: 859659601}
- {fileID: 74445107}
- {fileID: 1971612942}
- {fileID: 1302773985}
- {fileID: 437365063}
- {fileID: 8583770408142850956}
- {fileID: 2218017386111396071}
- {fileID: 1533045682}
- {fileID: 502168398}

@ -26,13 +26,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8062693631467405971}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 7.68}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8828233117929462120}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8062693631467405968
MonoBehaviour:
@ -120,7 +120,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8828233117929462120}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -227,6 +226,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8828233117929462122}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.2, y: 0, z: 0.04}
m_LocalScale: {x: 1, y: 1, z: 1}
@ -236,7 +236,6 @@ Transform:
- {fileID: 280076967622526788}
- {fileID: 8828233118302191113}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1445487721866086731
MonoBehaviour:

@ -24,13 +24,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 557158249}
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: 8217340658724853394}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &557158251
MonoBehaviour:
@ -70,6 +70,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8217340658724853393}
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}
@ -77,7 +78,6 @@ Transform:
m_Children:
- {fileID: 557158250}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8217340658724853395
MonoBehaviour:

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: 16
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: 1ef1d30456a168f4ab8daf05167e275a, type: 3}
upgradeText: 16
memberPrefab: {fileID: 6960221401218490388, guid: 342a16111920f4d488c82770d2898b9c, type: 3}
silhouetteIcon: {fileID: 21300000, guid: bc21ce2dc3abe2e4a84bbc8e03e83d75, type: 3}
characters:
- {fileID: 3452663665387872997, guid: b28b2f8608506fd438634f52ee1d07f0, type: 3}
- {fileID: 1719168117689390894, guid: 3613bc0b048d3d04bb8dc82851910566, type: 3}

@ -16,3 +16,6 @@ MonoBehaviour:
upgradeText: ADD 2
memberPrefab: {fileID: 873183754724297478, guid: 559c40fc91d73514997bf2450e855e89, type: 3}
silhouetteIcon: {fileID: 21300000, guid: 6a41277c2c6b40b4eb50ae86c74b1d94, type: 3}
characters:
- {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
- {fileID: 873183754724297478, guid: d80af68ec50fd8a438814f1885d321fe, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: 32
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: 1ef1d30456a168f4ab8daf05167e275a, type: 3}
upgradeText: 32
memberPrefab: {fileID: 3837912158486870778, guid: a71fb0548354cdc43b7e070d6b35c107, type: 3}
silhouetteIcon: {fileID: 21300000, guid: bc21ce2dc3abe2e4a84bbc8e03e83d75, type: 3}
characters:
- {fileID: 3452663665387872997, guid: 54273862f3ba2324a8b6851f35dd6c70, type: 3}
- {fileID: 1719168117689390894, guid: 18cb5448d5e8d3c41814a287cc293aa9, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: 4
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: 1ef1d30456a168f4ab8daf05167e275a, type: 3}
upgradeText: 4
memberPrefab: {fileID: 57232198312681594, guid: 88fe7e5405003b7438054ed0cad815ea, type: 3}
silhouetteIcon: {fileID: 21300000, guid: bc21ce2dc3abe2e4a84bbc8e03e83d75, type: 3}
characters:
- {fileID: 3452663665387872997, guid: 7c97424ff2f9e2043a110986a5099441, type: 3}
- {fileID: 1719168117689390894, guid: 7459b0a55add33b43a1cbdab6d4e47c2, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: 64
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: 1ef1d30456a168f4ab8daf05167e275a, type: 3}
upgradeText: 64
memberPrefab: {fileID: 5548354385964341137, guid: bd401a9e9ee0eec47b1f705b5baac807, type: 3}
silhouetteIcon: {fileID: 21300000, guid: bc21ce2dc3abe2e4a84bbc8e03e83d75, type: 3}
characters:
- {fileID: 3452663665387872997, guid: 2f61fa99aae2e5c47b72f2caff1a572a, type: 3}
- {fileID: 1719168117689390894, guid: 6a99bbf8445659544990538496d45a77, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: 8
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: 1ef1d30456a168f4ab8daf05167e275a, type: 3}
upgradeText: 8
memberPrefab: {fileID: 2278021325583972127, guid: 05ab732d9866c2949afae185d1d90287, type: 3}
silhouetteIcon: {fileID: 21300000, guid: bc21ce2dc3abe2e4a84bbc8e03e83d75, type: 3}
characters:
- {fileID: 3452663665387872997, guid: d4704fbc1478727428e644d145a1f889, type: 3}
- {fileID: 1719168117689390894, guid: e500de05471f9b64db6acd50b2cb65c3, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: Double Pistol Upgrade
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: 823b7bbdb6dd1c3449571655e07f00d3, type: 3}
upgradeText: Double Pistol
memberPrefab: {fileID: 873183754724297478, guid: 346f1e48dace53b4cb7f8f3d07e8b08f, type: 3}
silhouetteIcon: {fileID: 21300000, guid: 514db957558a50b45a9c3e7ea6c17a43, type: 3}
characters:
- {fileID: 873183754724297478, guid: 346f1e48dace53b4cb7f8f3d07e8b08f, type: 3}
- {fileID: 873183754724297478, guid: 346f1e48dace53b4cb7f8f3d07e8b08f, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: Flamethrower Upgrade
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: 3819a73f68ca8f84c87d7c75c4cb3f8d, type: 3}
upgradeText: Fire Man
memberPrefab: {fileID: 3822126870382918512, guid: c328b5a2e98149d4bb5732b7358a7f97, type: 3}
silhouetteIcon: {fileID: 21300000, guid: 914f43c0f7cc00d4c96547e1ba30f2ce, type: 3}
characters:
- {fileID: 3822126870382918512, guid: c328b5a2e98149d4bb5732b7358a7f97, type: 3}
- {fileID: 3822126870382918512, guid: c328b5a2e98149d4bb5732b7358a7f97, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: Grenade Launcher Upgrade
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: 41544043d43cb444db3ab7beb6def4c0, type: 3}
upgradeText: Grenade
memberPrefab: {fileID: 4870095521021279303, guid: 2e868d0dfe8895f4a9ac052a7013a2d2, type: 3}
silhouetteIcon: {fileID: 21300000, guid: 2396e9332cf773441b07d4c7344efa17, type: 3}
characters:
- {fileID: 4870095521021279303, guid: 2e868d0dfe8895f4a9ac052a7013a2d2, type: 3}
- {fileID: 4870095521021279303, guid: 2e868d0dfe8895f4a9ac052a7013a2d2, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: Laser Upgrade
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: a73dc9c6be04afd4bb5cb53e0f2aca32, type: 3}
upgradeText: Laser
memberPrefab: {fileID: 873183754724297478, guid: 49c729deb000f794c973568cd4bdad17, type: 3}
silhouetteIcon: {fileID: 21300000, guid: b6d5e0ac3e3d57a47b6a494be2fe73c2, type: 3}
characters:
- {fileID: 873183754724297478, guid: 49c729deb000f794c973568cd4bdad17, type: 3}
- {fileID: 873183754724297478, guid: 49c729deb000f794c973568cd4bdad17, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: Machine Gun Upgrade
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: a36f4c4c75225c4449772292b434c8b0, type: 3}
upgradeText: Auto Gun
memberPrefab: {fileID: 991471788331666158, guid: 032fa9bcb3342fc49b4a4b408c6c925a, type: 3}
silhouetteIcon: {fileID: 21300000, guid: e4783c051ec0dce47b7b04787e4c3b41, type: 3}
characters:
- {fileID: 991471788331666158, guid: 032fa9bcb3342fc49b4a4b408c6c925a, type: 3}
- {fileID: 991471788331666158, guid: 032fa9bcb3342fc49b4a4b408c6c925a, type: 3}

@ -1,4 +1,6 @@
using System;
using System.Collections.Generic;
using Unity.VisualScripting;
using UnityEngine;
[CreateAssetMenu(menuName = "Game/Upgrades/Member Upgrade")]
@ -6,8 +8,20 @@ public class MemberUpgrades : Upgrades
{
[SerializeField] private GameObject memberPrefab;
[SerializeField] private Sprite silhouetteIcon;
public GameObject MemberPrefab => memberPrefab;
public List<GameObject> characters;
public GameObject MemberPrefab {
get {
memberPrefab = GetCurrentCharacter();
return memberPrefab;
} }
public override UpgradesType GetUpgradeType() => UpgradesType.Member;
public Sprite SilhouetteIcon => silhouetteIcon;
private GameObject GetCurrentCharacter()
{
int currentCharacterIndex = PlayerPrefs.GetInt(Constants.PlayerSelectionKey, 0);
Debug.Log("Characted Selection ID: " + currentCharacterIndex);
return characters[currentCharacterIndex];
}
}

@ -16,3 +16,6 @@ MonoBehaviour:
upgradeText: Pistol
memberPrefab: {fileID: 873183754724297478, guid: 559c40fc91d73514997bf2450e855e89, type: 3}
silhouetteIcon: {fileID: 21300000, guid: bc21ce2dc3abe2e4a84bbc8e03e83d75, type: 3}
characters:
- {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
- {fileID: 873183754724297478, guid: d80af68ec50fd8a438814f1885d321fe, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: Rifle Gun Upgrade
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: 1bf2defb3b4ee61448d8ecaee8cab814, type: 3}
upgradeText: Rifle Gun
memberPrefab: {fileID: 6315814973022697327, guid: 1ebc327a455450d4e94dd35148847849, type: 3}
silhouetteIcon: {fileID: 21300000, guid: ca07cd7be3ce6374b9e93edd90f84bb8, type: 3}
characters:
- {fileID: 6315814973022697327, guid: 1ebc327a455450d4e94dd35148847849, type: 3}
- {fileID: 6315814973022697327, guid: 1ebc327a455450d4e94dd35148847849, type: 3}

@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 650147a9eb743724e9fb1348388a3669, type: 3}
m_Name: Shotgun Upgrade
m_EditorClassIdentifier:
upgradesType: 2
icon: {fileID: 21300000, guid: b99102c46a09143499bff95c8bff75dd, type: 3}
upgradeText: Shotgun
memberPrefab: {fileID: 8762324236585117994, guid: 9f79da83f67181e43a48e61b7d419ae4, type: 3}
silhouetteIcon: {fileID: 21300000, guid: 5f33bc7ec06e72c46bb9e1754bb2b13f, type: 3}
characters:
- {fileID: 8762324236585117994, guid: 9f79da83f67181e43a48e61b7d419ae4, type: 3}
- {fileID: 8762324236585117994, guid: 9f79da83f67181e43a48e61b7d419ae4, type: 3}

@ -7,7 +7,7 @@
<files />
<settings>
<setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
<setting name="bundleId" value="com.Rizze.MergeShootingSquad" />
<setting name="bundleId" value="com.Rizze.HeroesOfLabyrinth" />
<setting name="explodeAars" value="True" />
<setting name="gradleBuildEnabled" value="True" />
<setting name="gradlePropertiesTemplateEnabled" value="True" />

@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: Rizze
productName: MergeShootingSquad
productName: HeroesOfLabyrinth
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
@ -162,7 +162,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.Rizze.MergeShootingSquad
Android: com.Rizze.HeroesOfLabyrinth
Standalone: com.D2DGames.D2D
iPhone: com.gucgames.merge.defence.squad.shoot
buildNumber:
@ -290,7 +290,7 @@ PlayerSettings:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: ae65c6fcc84914bdfb928be3dbf64c0e, type: 3}
m_Icon: {fileID: 2800000, guid: 09b5cb90a026d2c49bd8a9699138f1e1, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0

Loading…
Cancel
Save