-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* ensure other job-givers refer to mom as Dr Ramirez
* test of alternate job graph patching * test of job prediction parameter loading * fixed instance of job view node click zone not fully covering secondary job giver click zone * unified research test logic for easier integration
- Loading branch information
1 parent
7ca2357
commit 202f2c5
Showing
30 changed files
with
5,612 additions
and
5,076 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"kelp-welcome": { | ||
"m_CashReward": 1500 | ||
}, | ||
"displaced-reef": { | ||
"m_PrerequisiteJobs": [ | ||
"kelp-welcome" | ||
] | ||
} | ||
"ScienceTweaks": { | ||
"m_BaseExperiencePerLevel": [25, 50, 100] | ||
} | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
target job,constant,job a,job a co.,job b,job b co.,job c,job c co.,completed tasks co.,completed jobs co.,completed jobs w/ exp > 2 co.,completed jobs w/ model > 2 co.,completed jobs w/ argue > 2 co.,visited biomes co.,session count co.,total playtime co. | ||
displaced-reef,-0.1,kelp-welcome,1,kelp-welcome,0,kelp-welcome,0,0,0,0,0,0,0,0,0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
#if (UNITY_EDITOR && !IGNORE_UNITY_EDITOR) || DEVELOPMENT_BUILD | ||
#define DEVELOPMENT | ||
#endif | ||
|
||
// comment out this define to disable the AB test | ||
#define ANALYTICS_ABTEST_ALTJOBGRAPH | ||
|
||
using System; | ||
using BeauUtil; | ||
using Aqua.Profile; | ||
using System.Collections.Generic; | ||
using UnityEngine; | ||
using BeauUtil.Debugger; | ||
using BeauRoutine; | ||
using System.Collections; | ||
|
||
namespace Aqua.Analytics { | ||
static public class AlternateJobGraphFeature { | ||
private const string PatchFilePath = "Research/AltJobGraphPatch"; | ||
|
||
public enum Status { | ||
Invalid, | ||
Inactive, | ||
Active | ||
} | ||
|
||
static public Status GetStatus(SaveData saveData) { | ||
#if ANALYTICS_ABTEST_ALTJOBGRAPH | ||
return ResearchTests.IsABC(saveData, 2) ? Status.Active : Status.Inactive; | ||
#else | ||
return Status.Invalid; | ||
#endif // ANALYTICS_ABTEST_ALTJOBGRAPH | ||
} | ||
|
||
static public void TryApplyPatch() { | ||
#if ANALYTICS_ABTEST_ALTJOBGRAPH | ||
if (GetStatus(Save.Current) != Status.Active) { | ||
ContentPatcher.Undo(); | ||
return; | ||
} | ||
|
||
if (ContentPatcher.IsPatched()) { | ||
return; | ||
} | ||
|
||
TextAsset patchFile = Resources.Load<TextAsset>(PatchFilePath); | ||
ContentPatcher.Apply(patchFile.text); | ||
Resources.UnloadAsset(patchFile); | ||
#endif // ANALYTICS_ABTEST_ALTJOBGRAPH | ||
} | ||
|
||
static public string GetModifiedBranchName(string branchName, Status active) { | ||
switch (active) { | ||
case Status.Invalid: | ||
default: | ||
return branchName; | ||
case Status.Inactive: | ||
return branchName + "-original-job-graph"; | ||
case Status.Active: | ||
return branchName + "-alt-job-graph"; | ||
} | ||
} | ||
} | ||
} |
11 changes: 11 additions & 0 deletions
11
Assets/_Modules/Analytics/AlternateJobGraphFeature.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.