add some extra assets FX and SFX

This commit is contained in:
Robii Aragon
2026-03-29 23:03:14 -07:00
parent 6ef3eb1535
commit 24dc66a81e
10142 changed files with 2535978 additions and 36608 deletions

View File

@@ -123,6 +123,9 @@ public class objectiveEventSystem : MonoBehaviour
public bool resetSubobjectivesIfCancellingMission = true;
public bool missionCanBeReplayed;
public string timerPanelName = "Timer";
public string timerTextPanelName = "Timer Text";
@@ -305,7 +308,7 @@ public class objectiveEventSystem : MonoBehaviour
bool checkIfMissionCanBeStarted ()
{
if (!objectiveInProcess) {
if (objectiveComplete) {
if (objectiveComplete && !missionCanBeReplayed) {
if (showDebugPrint) {
print ("mission already complete, avoiding to set sub objective complete " + generalObjectiveName);
}
@@ -568,10 +571,23 @@ public class objectiveEventSystem : MonoBehaviour
return;
}
if (objectiveComplete) {
if (objectiveComplete && !missionCanBeReplayed) {
return;
}
//check to reset mission info if it is being replayed
if (missionCanBeReplayed) {
if (objectiveComplete) {
objectiveComplete = false;
rewardsObtained = false;
resetAllSubObjectives ();
currentSubObjectiveIndex = 0;
}
}
bool objectiveCanBeAdded = false;
if (currentObjectiveLogSystem != null && currentObjectiveLogSystem.isCheckMinLevelOnMissionsEnabled ()) {
@@ -998,7 +1014,6 @@ public class objectiveEventSystem : MonoBehaviour
if (saveGameOnMissionComplete) {
saveGameOnMissionStateChange ();
}
}
@@ -1184,6 +1199,11 @@ public class objectiveEventSystem : MonoBehaviour
return objectiveComplete;
}
public bool getMissionCanBeReplayed ()
{
return missionCanBeReplayed;
}
public bool isMissionCanBeCancelledEnabled ()
{
return missionCanBeCancelledEnabled;

View File

@@ -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/Objectives Mission System/objectiveEventSystem.cs
uploadId: 814740
uploadId: 889948

View File

@@ -155,7 +155,13 @@ public class objectiveLogSystem : MonoBehaviour
public void activeObjective ()
{
if (currentObjectiveSlot != null && currentObjectiveSlot.objectiveEventManager != null) {
if (!currentObjectiveSlot.objectiveEventManager.isObjectiveComplete () && !currentObjectiveSlot.objectiveEventManager.isObjectiveInProcess ()) {
bool canActivateObjectiveResult = false;
canActivateObjectiveResult = (!currentObjectiveSlot.objectiveEventManager.isObjectiveComplete () ||
currentObjectiveSlot.objectiveEventManager.getMissionCanBeReplayed ()) &&
!currentObjectiveSlot.objectiveEventManager.isObjectiveInProcess ();
if (canActivateObjectiveResult) {
currentObjectiveSlot.objectiveEventManager.startObjective ();
if (!currentObjectiveSlot.currentObjectiveIcon.activeSelf) {
@@ -193,9 +199,9 @@ public class objectiveLogSystem : MonoBehaviour
setButtonsColor (false, false);
}
// if (currentObjectiveSlot.objectiveEventManager.removeMissionSlotFromObjectiveLogOnCancelMission) {
// removeObjectiveSlotFromMenu (currentObjectiveSlot.objectiveEventManager.missionID, currentObjectiveSlot.objectiveEventManager.missionScene);
// }
//if (currentObjectiveSlot.objectiveEventManager.removeMissionSlotFromObjectiveLogOnCancelMission) {
//removeObjectiveSlotFromMenu (currentObjectiveSlot.objectiveEventManager.missionID, currentObjectiveSlot.objectiveEventManager.missionScene);
//}
}
}
}
@@ -252,6 +258,40 @@ public class objectiveLogSystem : MonoBehaviour
currentObjectiveSlotInfo.missionComplete = true;
}
public void checkUpdateObjectiveSlotInfo (objectiveEventSystem currentObjectiveEventSystem)
{
int objectiveSlotInfoListCount = objectiveSlotInfoList.Count;
for (int i = 0; i < objectiveSlotInfoListCount; i++) {
objectiveSlotInfo currentObjectiveSlotInfo = objectiveSlotInfoList [i];
if (currentObjectiveSlotInfo.objectiveEventManager == currentObjectiveEventSystem) {
if (currentObjectiveSlotInfo.addObjectiveToPlayerLogSystem) {
if (!currentObjectiveSlotInfo.disableObjectivePanelOnMissionComplete) {
bool isObjectiveComplete = currentObjectiveEventSystem.isObjectiveComplete ();
if (currentObjectiveSlotInfo.objectiveCompletePanel.activeSelf != isObjectiveComplete) {
currentObjectiveSlotInfo.objectiveCompletePanel.SetActive (isObjectiveComplete);
}
if (currentObjectiveSlotInfo.objectiveCompleteText.activeSelf != isObjectiveComplete) {
currentObjectiveSlotInfo.objectiveCompleteText.SetActive (isObjectiveComplete);
}
bool isObjectiveInProcess = currentObjectiveEventSystem.isObjectiveInProcess ();
if (currentObjectiveSlotInfo.currentObjectiveIcon.activeSelf != isObjectiveInProcess) {
currentObjectiveSlotInfo.currentObjectiveIcon.SetActive (isObjectiveInProcess);
}
}
}
return;
}
}
}
public void updateSubObjectiveCompleteListSlotInfo (int objectiveSlotIndex, List<bool> subObjectiveCompleteList)
{
objectiveSlotInfo currentObjectiveSlotInfo = objectiveSlotInfoList [objectiveSlotIndex];
@@ -358,7 +398,11 @@ public class objectiveLogSystem : MonoBehaviour
setButtonsColor (true, false);
}
} else {
setButtonsColor (false, false);
if (currentObjectiveSlot.objectiveEventManager.getMissionCanBeReplayed ()) {
setButtonsColor (true, false);
} else {
setButtonsColor (false, false);
}
}
} else {
setButtonsColor (false, false);

View File

@@ -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/Objectives Mission System/objectiveLogSystem.cs
uploadId: 814740
uploadId: 889948

View File

@@ -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/Objectives Mission System/objectiveManager.cs
uploadId: 814740
uploadId: 889948

View File

@@ -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/Objectives Mission System/objectiveMenuIconElement.cs
uploadId: 814740
uploadId: 889948

View File

@@ -147,7 +147,8 @@ public class objectiveStationSystem : MonoBehaviour
if (currentCharacterObjectiveIndex <= indexMissionToCheck) {
for (int i = 0; i < objectiveInfoList.Count; i++) {
if (objectiveInfoList [i].mainObjectiveEventSystem != null) {
if (!objectiveInfoList [i].mainObjectiveEventSystem.isObjectiveComplete ()) {
if (!objectiveInfoList [i].mainObjectiveEventSystem.isObjectiveComplete () ||
objectiveInfoList [i].mainObjectiveEventSystem.getMissionCanBeReplayed ()) {
// print ("more missions");
return true;

View File

@@ -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/Objectives Mission System/objectiveStationSystem.cs
uploadId: 814740
uploadId: 889948

View File

@@ -258,10 +258,23 @@ public class objectiveStationUISystem : MonoBehaviour
currentObjectiveInfo = currentObjectiveInfoList [currentCharacterObjectiveIndex];
if (currentObjectiveInfo.mainObjectiveEventSystem.isObjectiveComplete () || currentObjectiveInfo.mainObjectiveEventSystem.isMissionAccepted ()) {
characterAcceptMissionButton.SetActive (false);
bool characterAcceptMissionButtonResult = false;
if (currentObjectiveInfo.mainObjectiveEventSystem.isObjectiveComplete ()) {
if (currentObjectiveInfo.mainObjectiveEventSystem.getMissionCanBeReplayed ()) {
characterAcceptMissionButtonResult = true;
}
//if (currentObjectiveInfo.mainObjectiveEventSystem.isMissionAccepted ()) {
// characterAcceptMissionButtonResult = false;
//}
} else {
characterAcceptMissionButton.SetActive (true);
characterAcceptMissionButtonResult = true;
}
if (characterAcceptMissionButton.activeSelf != characterAcceptMissionButtonResult) {
characterAcceptMissionButton.SetActive (characterAcceptMissionButtonResult);
}
bool showMissionInfo = false;
@@ -454,7 +467,15 @@ public class objectiveStationUISystem : MonoBehaviour
currentObjectiveSlot.slotSelectedByPlayer = true;
setButtonsColor (false);
if (currentObjectiveSlot.objectiveEventManager.getMissionCanBeReplayed ()) {
if (currentObjectiveSlot.objectiveEventManager.isRewardsObtained ()) {
setButtonsColor (true);
} else {
setButtonsColor (false);
}
} else {
setButtonsColor (false);
}
}
return;
@@ -510,7 +531,20 @@ public class objectiveStationUISystem : MonoBehaviour
public void acceptMissionFromObjectiveStationPanel ()
{
if (currentObjectiveSlot != null) {
if (!currentObjectiveSlot.objectiveEventManager.isObjectiveComplete ()) {
bool missionCanBeReplayed = currentObjectiveSlot.objectiveEventManager.getMissionCanBeReplayed ();
bool isObjectiveComplete = currentObjectiveSlot.objectiveEventManager.isObjectiveComplete ();
if ((!isObjectiveComplete || missionCanBeReplayed) &&
!currentObjectiveInfo.mainObjectiveEventSystem.isObjectiveInProcess ()) {
if (missionCanBeReplayed) {
if (isObjectiveComplete) {
if (!currentObjectiveSlot.objectiveEventManager.isRewardsObtained ()) {
return;
}
}
}
for (int j = 0; j < currentObjectiveInfoList.Count; j++) {
if (currentObjectiveInfoList [j].mainObjectiveEventSystem == currentObjectiveSlot.objectiveEventManager) {
@@ -547,9 +581,16 @@ public class objectiveStationUISystem : MonoBehaviour
currentObjectiveSlot.objectiveAcceptedText.SetActive (true);
if (missionCanBeReplayed && isObjectiveComplete) {
currentObjectiveSlot.objectiveCompletePanel.SetActive (false);
currentObjectiveSlot.objectiveCompleteText.SetActive (false);
}
setButtonsColor (false);
showMissionAcceptedMessage (currentObjectiveInfo.mainObjectiveEventSystem.generalObjectiveName);
mainObjectiveLogSystem.checkUpdateObjectiveSlotInfo (currentObjectiveInfo.mainObjectiveEventSystem);
}
}
}
@@ -558,7 +599,8 @@ public class objectiveStationUISystem : MonoBehaviour
public void acceptMissionFromCharacterObjectivePanel ()
{
if (currentObjectiveInfo != null) {
if (!currentObjectiveInfo.mainObjectiveEventSystem.isObjectiveComplete () && !currentObjectiveInfo.mainObjectiveEventSystem.isObjectiveInProcess ()) {
if ((!currentObjectiveInfo.mainObjectiveEventSystem.isObjectiveComplete () || currentObjectiveInfo.mainObjectiveEventSystem.getMissionCanBeReplayed ()) &&
!currentObjectiveInfo.mainObjectiveEventSystem.isObjectiveInProcess ()) {
if (mainObjectiveLogSystem.checkMinLevelOnMissions) {
bool objectiveCanBeAdded = false;
@@ -718,9 +760,10 @@ public class objectiveStationUISystem : MonoBehaviour
public void checkIfMissionsAvailableInCharacter ()
{
if (useCharacterObjectivePanel) {
// print (currentObjectiveInfo.mainObjectiveEventSystem.isObjectiveComplete () + " " + currentObjectiveInfo.mainObjectiveEventSystem.isRewardsObtained ());
if (currentObjectiveInfo != null &&
currentObjectiveInfo.mainObjectiveEventSystem.isObjectiveComplete () &&
currentObjectiveInfo.mainObjectiveEventSystem.isRewardsObtained ()) {
if (currentObjectiveInfo != null && currentObjectiveInfo.mainObjectiveEventSystem.isObjectiveComplete () && currentObjectiveInfo.mainObjectiveEventSystem.isRewardsObtained ()) {
currentCharacterObjectiveIndex += 1;
if (currentObjectiveStationSystem.isThereMissionsAvailableOnStation (currentCharacterObjectiveIndex)) {

View File

@@ -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/Objectives Mission System/objectiveStationUISystem.cs
uploadId: 814740
uploadId: 889948

View File

@@ -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/Objectives Mission System/playerScreenObjectivesSystem.cs
uploadId: 814740
uploadId: 889948

View File

@@ -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/Objectives Mission System/screenObjectivesSystem.cs
uploadId: 814740
uploadId: 889948

View File

@@ -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/Objectives Mission System/setMissionSubObjectiveStateRemotelySystem.cs
uploadId: 814740
uploadId: 889948