Commit cc9bcf75 authored by wildfirecode's avatar wildfirecode

1

parent 27f7372f
...@@ -313,8 +313,8 @@ ...@@ -313,8 +313,8 @@
"script": "components/base/Transform", "script": "components/base/Transform",
"properties": { "properties": {
"position": { "position": {
"x": 288.010101010101, "x": 333.4646464646464,
"y": -680.1464646464648, "y": -707.419191919192,
"_type_": "scilla/support/Vector2D" "_type_": "scilla/support/Vector2D"
} }
} }
...@@ -357,8 +357,8 @@ ...@@ -357,8 +357,8 @@
"script": "components/base/Transform", "script": "components/base/Transform",
"properties": { "properties": {
"position": { "position": {
"x": 288.010101010101, "x": 333.4646464646464,
"y": -742.9747474747473, "y": -766.611111111111,
"_type_": "scilla/support/Vector2D" "_type_": "scilla/support/Vector2D"
} }
} }
...@@ -447,11 +447,9 @@ ...@@ -447,11 +447,9 @@
"script": "components/base/Transform", "script": "components/base/Transform",
"properties": { "properties": {
"position": { "position": {
"_hashCode": 3405, "x": -324.5974025974026,
"_x": 0, "y": -763.7251082251084,
"_y": 299.651515151515, "_type_": "scilla/support/Vector2D"
"x": -317.14285714285717,
"y": -734.6341991341993
} }
} }
}, },
......
...@@ -43,6 +43,10 @@ export default class ScoreDialogContent extends DialogContent { ...@@ -43,6 +43,10 @@ export default class ScoreDialogContent extends DialogContent {
export const getRankURL = () => { export const getRankURL = () => {
return `/customActivity/sjf/activity/recordIndex?weddingId=${window['CFG'].weddingId}&activityId=${window['CFG'].activityId}&brickType=7` return `/customActivity/sjf/activity/recordIndex?weddingId=${window['CFG'].weddingId}&activityId=${window['CFG'].activityId}&brickType=7`
} }
export const getURL = () => {
//`/customActivity/sjf/mainIndex?weddingId=2
return `/customActivity/sjf/mainIndex?weddingId=${window['CFG'].weddingId}`;
}
export const getRecordURL = () => { export const getRecordURL = () => {
return `/customActivity/sjf/activity/recordIndex?weddingId=${window['CFG'].weddingId}&activityId=${window['CFG'].activityId}&brickType=6`; return `/customActivity/sjf/activity/recordIndex?weddingId=${window['CFG'].weddingId}&activityId=${window['CFG'].activityId}&brickType=6`;
......
...@@ -8,7 +8,7 @@ import { dynamic, Entity } from "scilla/src"; ...@@ -8,7 +8,7 @@ import { dynamic, Entity } from "scilla/src";
import { alien } from "../navigator/StackNavigator"; import { alien } from "../navigator/StackNavigator";
import { INavigatorViewBase } from "../navigator/VirtualNavigator"; import { INavigatorViewBase } from "../navigator/VirtualNavigator";
import { setText, setRotation, getRotation } from "../transformUtils"; import { setText, setRotation, getRotation } from "../transformUtils";
import { getRankURL, getRecordURL } from "../dialogs/ScoreDialogContent"; import { getRankURL, getRecordURL, getURL } from "../dialogs/ScoreDialogContent";
export default class SceneStart extends ScillaComponent implements INavigatorViewBase { export default class SceneStart extends ScillaComponent implements INavigatorViewBase {
doJoin: dynamic; doJoin: dynamic;
...@@ -185,15 +185,11 @@ export default class SceneStart extends ScillaComponent implements INavigatorVie ...@@ -185,15 +185,11 @@ export default class SceneStart extends ScillaComponent implements INavigatorVie
onClick_rankbtn() { onClick_rankbtn() {
window.location.href = getRankURL(); window.location.href = getRankURL();
// this.rankbtn.getComponent(Button).enabled = false;
// this.broadcast('callApi', 1, 'rankInfo', {
// weddingId: window['CFG'].weddingId,
// activityId: window['CFG'].activityId
// })
} }
onClick_backbtn() { onClick_backbtn() {
console.log('onClick_backbtn'); // console.log('onClick_backbtn');
window.location.href = getRankURL(); window.location.href = getURL()
} }
onResponse_rank() { onResponse_rank() {
......
assets/sheets/start.sht/backbtn.png

5.73 KB | W: | H:

assets/sheets/start.sht/backbtn.png

3.89 KB | W: | H:

assets/sheets/start.sht/backbtn.png
assets/sheets/start.sht/backbtn.png
assets/sheets/start.sht/backbtn.png
assets/sheets/start.sht/backbtn.png
  • 2-up
  • Swipe
  • Onion skin
assets/sheets/start.sht/recordbtn.png

5.12 KB | W: | H:

assets/sheets/start.sht/recordbtn.png

1.43 KB | W: | H:

assets/sheets/start.sht/recordbtn.png
assets/sheets/start.sht/recordbtn.png
assets/sheets/start.sht/recordbtn.png
assets/sheets/start.sht/recordbtn.png
  • 2-up
  • Swipe
  • Onion skin
assets/sheets/start.sht/rulebtn.png

5.11 KB | W: | H:

assets/sheets/start.sht/rulebtn.png

1.34 KB | W: | H:

assets/sheets/start.sht/rulebtn.png
assets/sheets/start.sht/rulebtn.png
assets/sheets/start.sht/rulebtn.png
assets/sheets/start.sht/rulebtn.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
This diff is collapsed.
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
"entryScene": "main" "entryScene": "main"
}, },
"webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010", "webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010",
"webServiceUrl": "http://localhost:4001", "webServiceUrl1": "http://localhost:4001",
"webServiceUrl1": "" "webServiceUrl": ""
}, },
"dataCenterConfig": { "dataCenterConfig": {
"dataCenterRoot": [ "dataCenterRoot": [
......
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