add some extra assets FX and SFX
This commit is contained in:
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/GKCLoadingScreenSystem.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/customActionOpenMenuSystem.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/customActionOpenMenuWeaponAttachment.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/homeMenu.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -199,6 +199,21 @@ public class ingameMenuPanel : MonoBehaviour
|
||||
|
||||
}
|
||||
|
||||
public virtual void checkMenuIfCurrentOpened ()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public virtual void checkMenuIfNotCurrentOpened ()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public virtual void checkAllMenusClosed ()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void openNextPlayerOpenMenu ()
|
||||
{
|
||||
pauseManagerLocated = pauseManager != null;
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/ingameMenuPanel.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -211,6 +211,12 @@ public class menuPause : MonoBehaviour
|
||||
|
||||
public bool ignoreShowOrHideMouseCursorAndPauseHideCheckOnClickExternally;
|
||||
|
||||
[Space]
|
||||
|
||||
public bool menuOpenedWithActionSystemActive;
|
||||
|
||||
public string menuOpenedWithActionSystemName;
|
||||
|
||||
[Space]
|
||||
[Header ("UI Elements")]
|
||||
[Space]
|
||||
@@ -278,6 +284,9 @@ public class menuPause : MonoBehaviour
|
||||
|
||||
bool externalFadeScreenActive;
|
||||
|
||||
bool allowToExitMenuWithTitleMenuTextButtonActive;
|
||||
|
||||
|
||||
void Awake ()
|
||||
{
|
||||
bool mainGameManagerLocated = mainGameManager != null;
|
||||
@@ -755,44 +764,75 @@ public class menuPause : MonoBehaviour
|
||||
|
||||
public void setIngameMenuOpenedState (string ingameMenuName, bool state, bool activateEvents)
|
||||
{
|
||||
for (int i = 0; i < ingameMenuInfoList.Count; i++) {
|
||||
if (ingameMenuInfoList [i].Name.Equals (ingameMenuName)) {
|
||||
ingameMenuInfoList [i].menuOpened = state;
|
||||
int ingameMenuInfoListCount = ingameMenuInfoList.Count;
|
||||
|
||||
int currentIngameMenuIndex = -1;
|
||||
|
||||
for (int i = 0; i < ingameMenuInfoListCount; i++) {
|
||||
ingameMenuInfo currentIngameMenuInfo = ingameMenuInfoList [i];
|
||||
|
||||
if (currentIngameMenuInfo.Name.Equals (ingameMenuName)) {
|
||||
|
||||
currentIngameMenuIndex = i;
|
||||
|
||||
currentIngameMenuInfo.menuOpened = state;
|
||||
|
||||
// createIngameMenuPanel (i);
|
||||
|
||||
if (activateEvents && ingameMenuInfoList [i].useEventOnOpenClose) {
|
||||
if (activateEvents && currentIngameMenuInfo.useEventOnOpenClose) {
|
||||
|
||||
if (state) {
|
||||
ingameMenuInfoList [i].eventOnOpen.Invoke ();
|
||||
currentIngameMenuInfo.eventOnOpen.Invoke ();
|
||||
} else {
|
||||
ingameMenuInfoList [i].eventOnClose.Invoke ();
|
||||
currentIngameMenuInfo.eventOnClose.Invoke ();
|
||||
}
|
||||
|
||||
checkEventOnOpenCloseInGameMenu (state);
|
||||
}
|
||||
|
||||
fadeInGameMenuPanel (ingameMenuInfoList [i], !state);
|
||||
fadeInGameMenuPanel (currentIngameMenuInfo, !state);
|
||||
|
||||
if (ingameMenuInfoList [i].setCustomTimeScale) {
|
||||
if (currentIngameMenuInfo.setCustomTimeScale) {
|
||||
if (state) {
|
||||
setTimeScale (ingameMenuInfoList [i].customTimeScale);
|
||||
setTimeScale (currentIngameMenuInfo.customTimeScale);
|
||||
} else {
|
||||
setTimeScale (1);
|
||||
}
|
||||
}
|
||||
|
||||
if (ingameMenuInfoList [i].pauseAIWhenOpenMenu) {
|
||||
GKC_Utils.pauseOrResumeAIOnScene (state, ingameMenuInfoList [i].pauseCharacterPriority);
|
||||
if (currentIngameMenuInfo.pauseAIWhenOpenMenu) {
|
||||
GKC_Utils.pauseOrResumeAIOnScene (state, currentIngameMenuInfo.pauseCharacterPriority);
|
||||
}
|
||||
|
||||
if (ingameMenuInfoList [i].setNewMouseCursorControllerSpeed) {
|
||||
if (currentIngameMenuInfo.setNewMouseCursorControllerSpeed) {
|
||||
if (state) {
|
||||
setMouseCursorControllerSpeedOnGameValue (ingameMenuInfoList [i].newMouseCursroControllerSpeed);
|
||||
setMouseCursorControllerSpeedOnGameValue (currentIngameMenuInfo.newMouseCursroControllerSpeed);
|
||||
} else {
|
||||
setOriginalMouseCursorControllerSpeedOnGameValue ();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (currentIngameMenuInfo.mainIngameMenuPanelAssigned) {
|
||||
currentIngameMenuInfo.mainIngameMenuPanel.checkMenuIfNotCurrentOpened ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (state) {
|
||||
if (currentIngameMenuIndex > -1) {
|
||||
ingameMenuInfo currentIngameMenuInfo = ingameMenuInfoList [currentIngameMenuIndex];
|
||||
|
||||
if (currentIngameMenuInfo.mainIngameMenuPanelAssigned) {
|
||||
currentIngameMenuInfo.mainIngameMenuPanel.checkMenuIfCurrentOpened ();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (int i = 0; i < ingameMenuInfoListCount; i++) {
|
||||
ingameMenuInfo currentIngameMenuInfo = ingameMenuInfoList [i];
|
||||
|
||||
if (currentIngameMenuInfo.mainIngameMenuPanelAssigned) {
|
||||
currentIngameMenuInfo.mainIngameMenuPanel.checkAllMenusClosed ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -801,6 +841,7 @@ public class menuPause : MonoBehaviour
|
||||
for (int i = 0; i < playerMenuInfoListCount; i++) {
|
||||
if (playerMenuInfoList [i].Name.Equals (ingameMenuName)) {
|
||||
currentPlayerMenuInfoIndex = i;
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1366,6 +1407,22 @@ public class menuPause : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public void setMenuOpenedWithActionSystemState (bool state, string menuName)
|
||||
{
|
||||
menuOpenedWithActionSystemActive = state;
|
||||
|
||||
menuOpenedWithActionSystemName = menuName;
|
||||
}
|
||||
|
||||
public void checkCloseMenuOpenedByActionSystem ()
|
||||
{
|
||||
if (playerMenuActive && menuOpenedWithActionSystemActive) {
|
||||
if (playerControllerManager.isActionActive ()) {
|
||||
playerControllerManager.playCurrentAnimationOnPlayerActionSystem ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool ignoreDeathStateOnMenuPauseState;
|
||||
|
||||
public void setIgnoreDeathStateOnMenuPauseState (bool state)
|
||||
@@ -2020,6 +2077,16 @@ public class menuPause : MonoBehaviour
|
||||
public void closePlayerMenuByName (string menuName)
|
||||
{
|
||||
if (openOrClosePlayerOpenMenuByNamePaused) {
|
||||
if (menuOpenedWithActionSystemActive && menuOpenedWithActionSystemName.Equals (menuName)) {
|
||||
checkCloseMenuOpenedByActionSystem ();
|
||||
}
|
||||
|
||||
if (allowToExitMenuWithTitleMenuTextButtonActive) {
|
||||
if (openMenuSystemAssigned) {
|
||||
currentOpenMenuSystem.closeMenu ();
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2195,6 +2262,11 @@ public class menuPause : MonoBehaviour
|
||||
return openOrClosePlayerOpenMenuByNamePaused;
|
||||
}
|
||||
|
||||
public void setAllowToExitMenuWithTitleMenuTextButtonActiveState (bool state)
|
||||
{
|
||||
allowToExitMenuWithTitleMenuTextButtonActive = state;
|
||||
}
|
||||
|
||||
public void setChangeBetweenIngameMenuPausedState (bool state)
|
||||
{
|
||||
changeBetweenIngameMenuPaused = state;
|
||||
@@ -2322,6 +2394,11 @@ public class menuPause : MonoBehaviour
|
||||
return mainGameManager.isLoadGameEnabled ();
|
||||
}
|
||||
|
||||
public bool isPlayerMenuActive ()
|
||||
{
|
||||
return playerMenuActive;
|
||||
}
|
||||
|
||||
public void saveGameInfoFromEditor (string saveInfoName)
|
||||
{
|
||||
mainGameManager.saveGameInfoFromEditor (saveInfoName);
|
||||
|
||||
@@ -11,7 +11,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/menuPause.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -18,7 +18,13 @@ public class openMenuSystem : MonoBehaviour
|
||||
|
||||
public bool pauseEscapeMenuKey = true;
|
||||
|
||||
public bool allowToExitMenuWithTitleMenuTextButton;
|
||||
|
||||
[Space]
|
||||
|
||||
public bool menuOpenedWithActionSystem;
|
||||
|
||||
[Space]
|
||||
[Header ("Other Settings")]
|
||||
[Space]
|
||||
|
||||
@@ -161,7 +167,15 @@ public class openMenuSystem : MonoBehaviour
|
||||
mainMenuPause.openPlayerOpenMenuByName (menuToOpenName);
|
||||
}
|
||||
|
||||
if (menuOpened) {
|
||||
if (menuOpenedWithActionSystem) {
|
||||
mainMenuPause.setMenuOpenedWithActionSystemState (menuOpened, menuToOpenName);
|
||||
}
|
||||
|
||||
if (allowToExitMenuWithTitleMenuTextButton) {
|
||||
mainMenuPause.setAllowToExitMenuWithTitleMenuTextButtonActiveState (menuOpened);
|
||||
}
|
||||
|
||||
if (menuOpened) {
|
||||
mainMenuPause.setOpenOrClosePlayerOpenMenuByNamePausedState (true);
|
||||
} else {
|
||||
if (pauseEscapeMenuKey) {
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/openMenuSystem.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/preventClickDrag.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -5,61 +5,61 @@ using UnityEngine.UI;
|
||||
|
||||
public class resetScrollRectOnEnable : MonoBehaviour
|
||||
{
|
||||
[Header ("Main Settings")]
|
||||
[Space]
|
||||
[Header ("Main Settings")]
|
||||
[Space]
|
||||
|
||||
public bool resetEnabled = true;
|
||||
public bool useVerticalPosition;
|
||||
public bool resetEnabled = true;
|
||||
public bool useVerticalPosition;
|
||||
|
||||
public float positionValue;
|
||||
public float positionValue;
|
||||
|
||||
[Space]
|
||||
[Header ("Debug")]
|
||||
[Space]
|
||||
[Space]
|
||||
[Header ("Debug")]
|
||||
[Space]
|
||||
|
||||
public bool showDebugPrint;
|
||||
public bool showDebugPrint;
|
||||
|
||||
[Space]
|
||||
[Header ("Components")]
|
||||
[Space]
|
||||
[Space]
|
||||
[Header ("Components")]
|
||||
[Space]
|
||||
|
||||
public RectTransform mainRectTransform;
|
||||
public ScrollRect mainScrollRect;
|
||||
public RectTransform mainRectTransform;
|
||||
public ScrollRect mainScrollRect;
|
||||
|
||||
|
||||
void OnEnable ()
|
||||
{
|
||||
if (resetEnabled) {
|
||||
if (gameObject.activeInHierarchy) {
|
||||
resetRectTransform ();
|
||||
}
|
||||
}
|
||||
}
|
||||
void OnEnable ()
|
||||
{
|
||||
if (resetEnabled) {
|
||||
resetRectTransform ();
|
||||
}
|
||||
}
|
||||
|
||||
public void resetRectTransform ()
|
||||
{
|
||||
StartCoroutine (resetRectTransformCoroutine ());
|
||||
}
|
||||
public void resetRectTransform ()
|
||||
{
|
||||
if (gameObject.activeInHierarchy) {
|
||||
StartCoroutine (resetRectTransformCoroutine ());
|
||||
}
|
||||
}
|
||||
|
||||
IEnumerator resetRectTransformCoroutine ()
|
||||
{
|
||||
if (showDebugPrint) {
|
||||
print ("reseting rect transform");
|
||||
}
|
||||
IEnumerator resetRectTransformCoroutine ()
|
||||
{
|
||||
if (showDebugPrint) {
|
||||
print ("reseting rect transform");
|
||||
}
|
||||
|
||||
if (mainRectTransform != null) {
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate (mainRectTransform);
|
||||
}
|
||||
if (mainRectTransform != null) {
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate (mainRectTransform);
|
||||
}
|
||||
|
||||
yield return new WaitForEndOfFrame ();
|
||||
yield return new WaitForEndOfFrame ();
|
||||
yield return new WaitForEndOfFrame ();
|
||||
yield return new WaitForEndOfFrame ();
|
||||
|
||||
if (mainScrollRect != null) {
|
||||
if (useVerticalPosition) {
|
||||
mainScrollRect.verticalNormalizedPosition = positionValue;
|
||||
} else {
|
||||
mainScrollRect.horizontalNormalizedPosition = positionValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (mainScrollRect != null) {
|
||||
if (useVerticalPosition) {
|
||||
mainScrollRect.verticalNormalizedPosition = positionValue;
|
||||
} else {
|
||||
mainScrollRect.horizontalNormalizedPosition = positionValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/resetScrollRectOnEnable.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -9,7 +9,8 @@ DefaultImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/sceneLoadSystem.cs.bak
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/sceneLoadSystem.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/sceneSlot.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/setCanvasParentSystem.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
@@ -13,7 +13,8 @@ MonoImporter:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 40995
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
|
||||
packageVersion: 3.77g
|
||||
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
|
||||
2.5D
|
||||
packageVersion: 3.77h
|
||||
assetPath: Assets/Game Kit Controller/Scripts/Menu/simpleUIButtonInfo.cs
|
||||
uploadId: 814740
|
||||
uploadId: 889948
|
||||
|
||||
Reference in New Issue
Block a user