8000 Valentin/Catalyst upgrades by Bryukh · Pull Request #7996 · codecombat/codecombat · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Valentin/Catalyst upgrades #7996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 22, 2025
Merged

Valentin/Catalyst upgrades #7996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ff4f83
Refactor user experiment logic to improve clarity and flow in User model
Bryukh May 22, 2025
adc7bd7
Enhance campaign view styles by introducing new variables for catalys…
Bryukh May 22, 2025
16a636e
Update anonymous classroom signup logic in CampaignView to exclude Ca…
Bryukh May 22, 2025
2a22853
Adjust tracking probability for anonymous users and refine experiment…
Bryukh May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/core/Tracker2/FullStoryTracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ export default class FullstoryTracker extends BaseTracker {
if (this.disableAllTracking) {
this.log('decide enabled', 'disable all tracking')
return false
} else if (me.anonymous && Math.random() < 0.0025) {
} else if (me.anonymous && Math.random() < 0.0015) {
this.log('decide enabled', 'anon user')
return true
} else if (window.me.getM7ExperimentValue() == 'beta' && Math.random() < 0.05) {
this.log('decide enabled', 'm7 experiment')
} else if (window.me.getCatalystExperimentValue() == 'beta' && Math.random() < 0.05) {
this.log('decide enabled', 'catalyst experiment')
return true
} else if (this.store.getters['me/isTeacher'] && !this.store.getters['me/isParent'] && Math.random() < 0.02) {
} else if (this.store.getters['me/isTeacher'] && !this.store.getters['me/isParent'] && Math.random() < 0.01) {
this.log('decide enabled', 'non parent teacher')
return true
}
Expand Down
5 changes: 3 additions & 2 deletions app/models/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,8 +1336,9 @@ module.exports = (User = (function () {
if (probability == null) {
// it means we're not running the experiment
value = 'control'
valueProbability = 1
} else if (Math.random() < probability) {
return value
}
if (Math.random() < probability) {
value = 'beta'
valueProbability = probability
} else {
Expand Down
16 changes: 9 additions & 7 deletions app/styles/play/campaign-view.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ $mapHeight: 1536
$mapWidth: 2350
$campaignPortalWidth: 317px
$campaignPortalHeight: 634px
$catalystPortalWidth: 317px
$catalystMarginTopBase: -60px
$sideCampaignPortalHeight: math.div($campaignPortalHeight, 2)
$sideCampaignImagesWidth: 1902px
$campaignHoverScale: 1.2
$betaImagesWidth: 951px
Expand Down Expand Up @@ -1369,18 +1372,18 @@ $gameControlMargin: 30px
width: 100%
height: $campaignPortalHeight
margin-bottom: 0
margin-top: -40px
margin-top: $catalystMarginTopBase

// first row has a different margin-top
&:first-child
margin-top: 50px
margin-bottom: -40px
//the third row has a different margin-top
&:nth-child(3)
margin-top: -70px
margin-top: $catalystMarginTopBase - 30px
// the last row has a different margin-top
&:last-child
margin-top: -20px
margin-top: $catalystMarginTopBase + 40px

.main-campaign
width: $campaignPortalWidth
Expand Down Expand Up @@ -1449,10 +1452,9 @@ $gameControlMargin: 30px
.side-campaign-container
position: absolute
width: $campaignPortalWidth
height: math.div($campaignPortalHeight, 2)
height: $sideCampaignPortalHeight
z-index: 0
top: $campaignPortalHeight
transform: translateY(-50%) // Adjust for half the height of the side campaign
top: $campaignPortalHeight - $sideCampaignPortalHeight

// Left side campaign container (first in the row)
&.left-campaign
Expand All @@ -1467,7 +1469,7 @@ $gameControlMargin: 30px

.side-campaign
width: $campaignPortalWidth
height: math.div($campaignPortalHeight, 2)
height: $sideCampaignPortalHeight
position: relative
cursor: pointer
@include transition(0.25s cubic-bezier(0.11, 0.67, 0.8, 1.42))
Expand Down
2 changes: 1 addition & 1 deletion app/views/play/CampaignView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2197,7 +2197,7 @@ class CampaignView extends RootView {
}

if (what === 'anonymous-classroom-signup') {
return me.isAnonymous() && (me.level() < 8) && me.promptForClassroomSignup() &&
return me.isAnonymous() && (me.level() < 8) && me.promptForClassroomSignup() && !this.isCatalyst &&
!this.editorMode && this.terrain !== 'junior' && !storage.load('hid-anonymous-classroom-signup-dialog')
}

Expand Down
0