add some extra assets FX and SFX
This commit is contained in:
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user