diff --git a/assets/resources/gui/prefab/demo.prefab b/assets/resources/gui/prefab/demo.prefab index 9208770..4306850 100644 --- a/assets/resources/gui/prefab/demo.prefab +++ b/assets/resources/gui/prefab/demo.prefab @@ -3,6 +3,7 @@ "__type__": "cc.Prefab", "_name": "demo", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 @@ -81,6 +82,7 @@ "__type__": "cc.Node", "_name": "spr_image", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -133,6 +135,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -160,6 +163,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -204,6 +208,7 @@ "__type__": "11b96k/RIZF57Loehxyl6Hs", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -236,6 +241,7 @@ "__type__": "cc.Node", "_name": "lab_time", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -285,6 +291,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 10 }, @@ -294,7 +301,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 169.02, + "width": 155.703125, "height": 50.4 }, "_anchorPoint": { @@ -312,6 +319,7 @@ "__type__": "57786GMN6RPbaAT9b9RmX18", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 10 }, @@ -329,7 +337,7 @@ "b": 255, "a": 255 }, - "_string": "0-1:56:12", + "_string": "02:46:38", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 40, @@ -346,7 +354,7 @@ "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 1, - "countDown": -228, + "countDown": 9999, "dayFormat": "{0} day", "timeFormat": "{0}:{1}:{2}", "zeroize": true, @@ -373,6 +381,7 @@ "__type__": "cc.Node", "_name": "lab_richtext", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -425,6 +434,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 16 }, @@ -434,7 +444,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 153.38, + "width": 153.37890625, "height": 50.4 }, "_anchorPoint": { @@ -452,6 +462,7 @@ "__type__": "cc.RichText", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 16 }, @@ -482,6 +493,7 @@ "__type__": "110c8vEd5NEPL/N9meGQnaX", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 16 }, @@ -514,6 +526,7 @@ "__type__": "cc.Node", "_name": "test_game", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -585,6 +598,7 @@ "__type__": "cc.Node", "_name": "btn_level_up", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 24 }, @@ -641,6 +655,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 25 }, @@ -690,6 +705,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 26 }, @@ -717,6 +733,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 26 }, @@ -774,6 +791,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 25 }, @@ -801,6 +819,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 25 }, @@ -845,6 +864,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 25 }, @@ -941,6 +961,7 @@ "__type__": "cc.Node", "_name": "btn_attack", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 24 }, @@ -997,6 +1018,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 40 }, @@ -1046,6 +1068,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 41 }, @@ -1073,6 +1096,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 41 }, @@ -1300,6 +1324,7 @@ "__type__": "cc.Node", "_name": "btn_change_job9", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 24 }, @@ -1356,6 +1381,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 55 }, @@ -1405,6 +1431,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 56 }, @@ -1432,6 +1459,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 56 }, @@ -1489,6 +1517,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 55 }, @@ -1516,6 +1545,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 55 }, @@ -1560,6 +1590,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 55 }, @@ -1656,6 +1687,7 @@ "__type__": "cc.Node", "_name": "btn_change_job5", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 24 }, @@ -1712,6 +1744,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 70 }, @@ -1761,6 +1794,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 71 }, @@ -1788,6 +1822,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 71 }, @@ -1845,6 +1880,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 70 }, @@ -1872,6 +1908,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 70 }, @@ -1916,6 +1953,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 70 }, @@ -2012,6 +2050,7 @@ "__type__": "cc.Node", "_name": "btn_change_job1", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 24 }, @@ -2068,6 +2107,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 85 }, @@ -2117,6 +2157,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 86 }, @@ -2144,6 +2185,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 86 }, @@ -2201,6 +2243,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 85 }, @@ -2228,6 +2271,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 85 }, @@ -2272,6 +2316,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 85 }, @@ -2368,6 +2413,7 @@ "__type__": "cc.Node", "_name": "btn_open_role_info", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 24 }, @@ -2424,6 +2470,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 100 }, @@ -2473,6 +2520,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 101 }, @@ -2500,6 +2548,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 101 }, @@ -2557,6 +2606,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 100 }, @@ -2584,6 +2634,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 100 }, @@ -2628,6 +2679,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 100 }, @@ -2839,6 +2891,7 @@ "__type__": "cc.Node", "_name": "test_ui", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -2913,6 +2966,7 @@ "__type__": "cc.Node", "_name": "btn_language", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 122 }, @@ -2969,6 +3023,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 123 }, @@ -3021,6 +3076,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 124 }, @@ -3048,6 +3104,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 124 }, @@ -3092,6 +3149,7 @@ "__type__": "110c8vEd5NEPL/N9meGQnaX", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 124 }, @@ -3124,6 +3182,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 123 }, @@ -3151,6 +3210,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 123 }, @@ -3195,6 +3255,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 123 }, @@ -3291,6 +3352,7 @@ "__type__": "cc.Node", "_name": "btn_common_prompt", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 122 }, @@ -3347,6 +3409,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 140 }, @@ -3399,6 +3462,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 141 }, @@ -3426,6 +3490,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 141 }, @@ -3470,6 +3535,7 @@ "__type__": "110c8vEd5NEPL/N9meGQnaX", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 141 }, @@ -3502,6 +3568,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 140 }, @@ -3529,6 +3596,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 140 }, @@ -3573,6 +3641,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 140 }, @@ -3669,6 +3738,7 @@ "__type__": "cc.Node", "_name": "btn_notify_show", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 122 }, @@ -3725,6 +3795,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 157 }, @@ -3777,6 +3848,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 158 }, @@ -3804,6 +3876,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 158 }, @@ -3848,6 +3921,7 @@ "__type__": "110c8vEd5NEPL/N9meGQnaX", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 158 }, @@ -3880,6 +3954,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 157 }, @@ -3907,6 +3982,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 157 }, @@ -3951,6 +4027,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 157 }, @@ -4047,6 +4124,7 @@ "__type__": "cc.Node", "_name": "netInstableOpen", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 122 }, @@ -4103,6 +4181,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 174 }, @@ -4155,6 +4234,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 175 }, @@ -4182,6 +4262,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 175 }, @@ -4226,6 +4307,7 @@ "__type__": "110c8vEd5NEPL/N9meGQnaX", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 175 }, @@ -4258,6 +4340,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 174 }, @@ -4285,6 +4368,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 174 }, @@ -4329,6 +4413,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 174 }, @@ -4425,6 +4510,7 @@ "__type__": "cc.Node", "_name": "btn_audio_open1", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 122 }, @@ -4481,6 +4567,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 191 }, @@ -4533,6 +4620,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 192 }, @@ -4560,6 +4648,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 192 }, @@ -4604,6 +4693,7 @@ "__type__": "110c8vEd5NEPL/N9meGQnaX", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 192 }, @@ -4636,6 +4726,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 191 }, @@ -4663,6 +4754,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 191 }, @@ -4707,6 +4799,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 191 }, @@ -4803,6 +4896,7 @@ "__type__": "cc.Node", "_name": "btn_audio_open2", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 122 }, @@ -4859,6 +4953,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 208 }, @@ -4911,6 +5006,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 209 }, @@ -4938,6 +5034,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 209 }, @@ -4982,6 +5079,7 @@ "__type__": "110c8vEd5NEPL/N9meGQnaX", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 209 }, @@ -5014,6 +5112,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 208 }, @@ -5041,6 +5140,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 208 }, @@ -5085,6 +5185,7 @@ "__type__": "cc.Button", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 208 }, @@ -5181,6 +5282,7 @@ "__type__": "cc.Node", "_name": "btn_long", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 122 }, @@ -5237,6 +5339,7 @@ "__type__": "cc.Node", "_name": "Label", "_objFlags": 512, + "__editorExtras__": {}, "_parent": { "__id__": 225 }, @@ -5289,6 +5392,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 226 }, @@ -5316,6 +5420,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 226 }, @@ -5360,6 +5465,7 @@ "__type__": "110c8vEd5NEPL/N9meGQnaX", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 226 }, @@ -5392,6 +5498,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 225 }, @@ -5419,6 +5526,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 225 }, @@ -5463,6 +5571,7 @@ "__type__": "da96en7WYpPTaPIkO1l/Nux", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 225 }, @@ -5627,6 +5736,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -5654,6 +5764,7 @@ "__type__": "cc.Widget", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -5689,6 +5800,7 @@ "__type__": "46770277MVCUJmttx/Kqt/a", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, diff --git a/assets/resources/language/spine/en.meta b/assets/resources/language/spine/en.meta index d4b9af8..36a6a68 100644 --- a/assets/resources/language/spine/en.meta +++ b/assets/resources/language/spine/en.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.0", + "ver": "1.2.0", "importer": "directory", "imported": true, "uuid": "e8088a3d-b4df-4b8a-9f19-0d827bfdc88c", diff --git a/assets/resources/language/spine/zh.meta b/assets/resources/language/spine/zh.meta index 26674c7..940ff0a 100644 --- a/assets/resources/language/spine/zh.meta +++ b/assets/resources/language/spine/zh.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.0", + "ver": "1.2.0", "importer": "directory", "imported": true, "uuid": "f5d2cf6b-9a62-473b-9284-cb90c020409e",