Commit fe0b9fac authored by yu's avatar yu

文件冲突

parent 49a12a93
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "a1GjpGzJdD65Biy/y88Sq8", "fileId": "a1GjpGzJdD65Biy/y88Sq8",
"sync": false "sync": false
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "afaLDsGNdF8rTS2GfZ3h3s", "fileId": "afaLDsGNdF8rTS2GfZ3h3s",
"sync": false "sync": false
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "24ejo0WoZJxpoRK40tkCN+", "fileId": "24ejo0WoZJxpoRK40tkCN+",
"sync": false "sync": false
...@@ -648,7 +648,7 @@ ...@@ -648,7 +648,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "42DCsVISJGIKgyDyhKrDpv", "fileId": "42DCsVISJGIKgyDyhKrDpv",
"sync": false "sync": false
...@@ -793,7 +793,7 @@ ...@@ -793,7 +793,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "4cZmgdmo1Az6QuveaZ6W/3", "fileId": "4cZmgdmo1Az6QuveaZ6W/3",
"sync": false "sync": false
...@@ -933,7 +933,7 @@ ...@@ -933,7 +933,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "8bJSQRyJRA0Jkcc+8GY5Do", "fileId": "8bJSQRyJRA0Jkcc+8GY5Do",
"sync": false "sync": false
...@@ -1144,7 +1144,7 @@ ...@@ -1144,7 +1144,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "1coIwLNVZGEZEzF3dItpuK", "fileId": "1coIwLNVZGEZEzF3dItpuK",
"sync": false "sync": false
...@@ -1231,7 +1231,7 @@ ...@@ -1231,7 +1231,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "55nJZ9Uk5CArtjDKXyL9xa", "fileId": "55nJZ9Uk5CArtjDKXyL9xa",
"sync": false "sync": false
...@@ -1414,7 +1414,7 @@ ...@@ -1414,7 +1414,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "eauguU1wtOrbhO0xPWGhAt", "fileId": "eauguU1wtOrbhO0xPWGhAt",
"sync": false "sync": false
...@@ -1589,7 +1589,7 @@ ...@@ -1589,7 +1589,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "60BI1U1b9OoZRIDunWHW0a", "fileId": "60BI1U1b9OoZRIDunWHW0a",
"sync": false "sync": false
...@@ -1622,7 +1622,7 @@ ...@@ -1622,7 +1622,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "5cd2Jos1dOS46NiARvN6qg", "fileId": "5cd2Jos1dOS46NiARvN6qg",
"sync": false "sync": false
...@@ -1729,7 +1729,7 @@ ...@@ -1729,7 +1729,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "8aSOlD3bNAYbWZEGUBpU7X", "fileId": "8aSOlD3bNAYbWZEGUBpU7X",
"sync": false "sync": false
...@@ -1836,7 +1836,7 @@ ...@@ -1836,7 +1836,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "ddBCn3FshPQ4V9KDNSlBfr", "fileId": "ddBCn3FshPQ4V9KDNSlBfr",
"sync": false "sync": false
...@@ -1946,7 +1946,7 @@ ...@@ -1946,7 +1946,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "6anh4wjaRPMqyS2LhXSx4j", "fileId": "6anh4wjaRPMqyS2LhXSx4j",
"sync": false "sync": false
...@@ -1957,7 +1957,7 @@ ...@@ -1957,7 +1957,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "f9qrJyDh5P1oErn3FfsNL7", "fileId": "f9qrJyDh5P1oErn3FfsNL7",
"sync": false "sync": false
...@@ -2115,7 +2115,7 @@ ...@@ -2115,7 +2115,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "24pM39t0xAcpeV3Rbf7iK5", "fileId": "24pM39t0xAcpeV3Rbf7iK5",
"sync": false "sync": false
...@@ -2126,7 +2126,7 @@ ...@@ -2126,7 +2126,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "28B+az6rRACpZT/KUohVaz", "fileId": "28B+az6rRACpZT/KUohVaz",
"sync": false "sync": false
...@@ -2159,7 +2159,7 @@ ...@@ -2159,7 +2159,7 @@
"_id": "" "_id": ""
}, },
{ {
"__type__": "4d354gk3w1AIKtlOv2FygBk", "__type__": "0e680i7L4BOy70UbUrC07pM",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -2174,7 +2174,7 @@ ...@@ -2174,7 +2174,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"fileId": "", "fileId": "",
"sync": false "sync": false
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d", "uuid": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef",
"optimizationPolicy": "SINGLE_INSTANCE", "optimizationPolicy": "AUTO",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"readonly": false, "readonly": false,
"subMetas": {} "subMetas": {}
......
...@@ -9934,7 +9934,7 @@ ...@@ -9934,7 +9934,7 @@
}, },
"_enabled": true, "_enabled": true,
"loadingLayerPrefab": { "loadingLayerPrefab": {
"__uuid__": "eeb30776-64d3-4ec2-962b-a1f4bee3b27d" "__uuid__": "119dfbe4-5ee2-4f66-8ebc-e2a9d75e73ef"
}, },
"_id": "eaTVUpqahPfZeO9+sUI7RP" "_id": "eaTVUpqahPfZeO9+sUI7RP"
}, },
......
...@@ -173,7 +173,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -173,7 +173,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
const loadingLayerNode = cc.instantiate(this.loadingLayerPrefab); const loadingLayerNode = cc.instantiate(this.loadingLayerPrefab);
loadingLayerBase.addChild(loadingLayerNode); loadingLayerBase.addChild(loadingLayerNode);
this.loadingLayer = loadingLayerNode.getComponent("BoardGame2_LoadingLayer"); this.loadingLayer = loadingLayerNode.getComponent("BoardGame2tree_LoadingLayer");
this.loadingLayer.setMaxPlayerNumber(2); this.loadingLayer.setMaxPlayerNumber(2);
this.loadingLayer.onLoadFinished(() => { this.loadingLayer.onLoadFinished(() => {
this.playAudioByUrl(this.data.gameStartAudio); this.playAudioByUrl(this.data.gameStartAudio);
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "4d354824-df0d-4020-ab65-3afd85ca0064", "uuid": "0e6808bb-2f80-4ecb-bd14-6d4ac2d3ba4c",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
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