Commit 94e07989 authored by rockyl's avatar rockyl

轮训判断2或者4都为成功

parent 48f1c7f4
{"currentScene":"assets/scenes/main.scene","dependencies":{"animation/Zoom":"1.0.0","animation/Translation":"1.0.0","renderer/HtmlRenderer":"1.0.0","ui/ScrollView":"1.0.0","ui/Button":"1.0.0","animation/TouchZoom":"1.0.0","animation/Fade":"1.0.0","animation/Wave":"1.0.0","other/RelativeLayout":"1.0.0","other/FullStageSize":"1.0.0","other/CameraController":"1.0.0","renderer/TextureRenderer":"1.0.0","renderer/RectRenderer":"1.0.0","renderer/FrameAnimationRenderer":"1.0.0","renderer/TextRenderer":"1.0.0","renderer/LineRenderer":"1.0.0","base/TouchInterrupt":"1.0.0","base/InteractComponent":"1.0.0","renderer/GraphicRenderer":"1.0.0","base/Transform":"1.0.3","base/ScillaComponent":"1.0.0","renderer/Renderer":"1.0.0"}} {
\ No newline at end of file "currentScene": "assets/scenes/main.scene",
"dependencies": {
"animation/Zoom": "1.0.0",
"animation/Translation": "1.0.0",
"renderer/HtmlRenderer": "1.0.0",
"ui/ScrollView": "1.0.0",
"ui/Button": "1.0.0",
"animation/TouchZoom": "1.0.0",
"animation/Fade": "1.0.0",
"animation/Wave": "1.0.0",
"other/RelativeLayout": "1.0.0",
"other/FullStageSize": "1.0.0",
"other/CameraController": "1.0.0",
"renderer/TextureRenderer": "1.0.0",
"renderer/RectRenderer": "1.0.0",
"renderer/FrameAnimationRenderer": "1.0.0",
"renderer/TextRenderer": "1.0.0",
"renderer/LineRenderer": "1.0.0",
"renderer/CircleRenderer": "1.0.0",
"base/TouchInterrupt": "1.0.0",
"base/InteractComponent": "1.0.0",
"renderer/GraphicRenderer": "1.0.0",
"base/Transform": "1.0.3",
"base/ScillaComponent": "1.0.0",
"renderer/Renderer": "1.0.0"
}
}
\ No newline at end of file
...@@ -82,7 +82,8 @@ ...@@ -82,7 +82,8 @@
"x": 0, "x": 0,
"_type_": "scilla/support/Vector2D" "_type_": "scilla/support/Vector2D"
} }
} },
"disabled": false
} }
], ],
"uuid": "2382acac-af06-4933-9bf7-179f99acbf67", "uuid": "2382acac-af06-4933-9bf7-179f99acbf67",
...@@ -122,14 +123,16 @@ ...@@ -122,14 +123,16 @@
"pivot": { "pivot": {
"y": 1, "y": 1,
"_type_": "scilla/support/Vector2D" "_type_": "scilla/support/Vector2D"
} },
"affectChildren": false
} }
}, },
{ {
"script": "components/other/FullStageSize", "script": "components/other/FullStageSize",
"properties": { "properties": {
"once": true "once": true
} },
"disabled": false
}, },
{ {
"script": "./scripts/scenes/SceneStart", "script": "./scripts/scenes/SceneStart",
...@@ -1122,7 +1125,9 @@ ...@@ -1122,7 +1125,9 @@
"components": [ "components": [
{ {
"script": "components/base/Transform", "script": "components/base/Transform",
"properties": {} "properties": {
"affectChildren": true
}
}, },
{ {
"script": "./scripts/popup/Popup", "script": "./scripts/popup/Popup",
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"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": "" "webServiceUrl": "http://localhost:3010"
}, },
"dataCenterConfig": { "dataCenterConfig": {
"dataCenterRoot": [ "dataCenterRoot": [
......
...@@ -8,6 +8,6 @@ ...@@ -8,6 +8,6 @@
"heapCredits":400, "heapCredits":400,
"miningExpend":100, "miningExpend":100,
"pkExpend":100, "pkExpend":100,
"machineNickname":"超级登山包超级登山包超级登山包" "machineNickname1":"超级登山包超级登山包超级登山包"
} }
} }
\ No newline at end of file
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
"noImplicitAny": false, "noImplicitAny": false,
"noEmitOnError": false, "noEmitOnError": false,
"downlevelIteration": true, "downlevelIteration": true,
"allowJs": true,
"lib": [ "lib": [
"es5", "es5",
"es6", "es6",
...@@ -75,6 +76,9 @@ ...@@ -75,6 +76,9 @@
"components/renderer/LineRenderer": [ "components/renderer/LineRenderer": [
"components/src/renderer/LineRenderer/1.0.0/index" "components/src/renderer/LineRenderer/1.0.0/index"
], ],
"components/renderer/CircleRenderer": [
"components/src/renderer/CircleRenderer/1.0.0/index"
],
"components/base/TouchInterrupt": [ "components/base/TouchInterrupt": [
"components/src/base/TouchInterrupt/1.0.0/index" "components/src/base/TouchInterrupt/1.0.0/index"
], ],
...@@ -97,8 +101,6 @@ ...@@ -97,8 +101,6 @@
}, },
"include": [ "include": [
"src", "src",
"assets", "assets"
"node_modules/scilla/src",
"node_modules/scilla-components/src"
] ]
} }
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