Commit 4841c01b authored by 神楽坂玲奈's avatar 神楽坂玲奈

Merge remote-tracking branch 'origin/mobile1' into mobile1

# Conflicts:
#	src/app/layout/layout.component.html
parents 2dad721b d2fd28bd
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --host 0.0.0.0", "start": "ng serve --host 0.0.0.0",
"build": "ng build --source-map --base-href https://cdntx.moecube.com.moecube.com/store/remake/ --deploy-url https://cdntx.moecube.com.moecube.com/store/remake/", "build": "ng build --source-map --base-href https://cdntx.moecube.com/store/remake/ --deploy-url https://cdntx.moecube.com/store/remake/",
"test": "ng test" "test": "ng test"
}, },
"private": true, "private": true,
......
...@@ -25,16 +25,16 @@ export class LayoutComponent implements OnInit, AfterViewInit { ...@@ -25,16 +25,16 @@ export class LayoutComponent implements OnInit, AfterViewInit {
}; };
latest_win32 = this.http latest_win32 = this.http
.get('https://cdntx.moecube.com.moecube.com/downloads/latest.yml', {responseType: 'text'}) .get('https://cdntx.moecube.com/downloads/latest.yml', {responseType: 'text'})
.pipe(map(rawData => 'https://cdntx.moecube.com.moecube.com/downloads/' + yaml.parse(rawData).path)); .pipe(map(rawData => 'https://cdntx.moecube.com/downloads/' + yaml.parse(rawData).path));
latest_linux = this.http latest_linux = this.http
.get('https://cdntx.moecube.com.moecube.com/downloads/latest-linux.yml', {responseType: 'text'}) .get('https://cdntx.moecube.com/downloads/latest-linux.yml', {responseType: 'text'})
.pipe(map(rawData => 'https://cdntx.moecube.com.moecube.com/downloads/' + yaml.parse(rawData).path)); .pipe(map(rawData => 'https://cdntx.moecube.com/downloads/' + yaml.parse(rawData).path));
latest_drawin = this.http latest_drawin = this.http
.get('https://cdntx.moecube.com.moecube.com/downloads/latest-mac.yml', {responseType: 'text'}) .get('https://cdntx.moecube.com/downloads/latest-mac.yml', {responseType: 'text'})
.pipe(map((rawData) => 'https://cdntx.moecube.com.moecube.com/downloads/' + yaml.parse(rawData).path.replace('-mac.zip', '.dmg'))); .pipe(map((rawData) => 'https://cdntx.moecube.com/downloads/' + yaml.parse(rawData).path.replace('-mac.zip', '.dmg')));
latest_current = 'https://ocean-h5.doinggame.com/?v=last' latest_current = 'https://ocean-h5.doinggame.com/?v=last'
ad_current = 'https://ocean-h5.doinggame.com/?v=last' ad_current = 'https://ocean-h5.doinggame.com/?v=last'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment