future 1 жил өмнө
parent
commit
439059c58b

+ 245 - 130
assets/edit_game.scene

@@ -23,7 +23,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 4977
+      "__id__": 4980
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 4978
+      "__id__": 4981
     },
     "_id": "3e8878c6-bf7a-430d-956a-65e1a4b1d2bd"
   },
@@ -89,10 +89,10 @@
         "__id__": 4908
       },
       {
-        "__id__": 4965
+        "__id__": 4968
       },
       {
-        "__id__": 4969
+        "__id__": 4972
       },
       {
         "__id__": 441
@@ -101,16 +101,16 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 4973
+        "__id__": 4976
       },
       {
-        "__id__": 4974
+        "__id__": 4977
       },
       {
-        "__id__": 4975
+        "__id__": 4978
       },
       {
-        "__id__": 4976
+        "__id__": 4979
       }
     ],
     "_prefab": null,
@@ -179763,16 +179763,16 @@
         "__id__": 4914
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 4962
+        "__id__": 4965
       },
       {
-        "__id__": 4963
+        "__id__": 4966
       },
       {
-        "__id__": 4964
+        "__id__": 4967
       }
     ],
     "_prefab": null,
@@ -179978,19 +179978,22 @@
         "__id__": 4918
       },
       {
-        "__id__": 4939
+        "__id__": 4921
+      },
+      {
+        "__id__": 4942
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 4959
+        "__id__": 4962
       },
       {
-        "__id__": 4960
+        "__id__": 4963
       },
       {
-        "__id__": 4961
+        "__id__": 4964
       }
     ],
     "_prefab": null,
@@ -180025,7 +180028,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "title",
+    "_name": "version",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -180042,6 +180045,115 @@
       }
     ],
     "_prefab": null,
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -680,
+      "y": 463,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": "bbj4I7VNVB+78bKmYAbYuD"
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 4915
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": "f4rbiTxUZPE49ERJnbWd6w"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 4915
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_string": "版本号",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": "0boHl78GBISKpKUotLxbhG"
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "title",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 4914
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4919
+      },
+      {
+        "__id__": 4920
+      }
+    ],
+    "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -180077,7 +180189,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4915
+      "__id__": 4918
     },
     "_enabled": true,
     "__prefab": null,
@@ -180099,7 +180211,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4915
+      "__id__": 4918
     },
     "_enabled": true,
     "__prefab": null,
@@ -180142,22 +180254,22 @@
     },
     "_children": [
       {
-        "__id__": 4919
+        "__id__": 4922
       },
       {
-        "__id__": 4929
+        "__id__": 4932
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 4937
+        "__id__": 4940
       },
       {
-        "__id__": 4938
+        "__id__": 4941
       },
       {
-        "__id__": 4927
+        "__id__": 4930
       }
     ],
     "_prefab": null,
@@ -180196,26 +180308,26 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 4918
+      "__id__": 4921
     },
     "_children": [
       {
-        "__id__": 4920
+        "__id__": 4923
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 4923
+        "__id__": 4926
       },
       {
-        "__id__": 4924
+        "__id__": 4927
       },
       {
-        "__id__": 4925
+        "__id__": 4928
       },
       {
-        "__id__": 4926
+        "__id__": 4929
       }
     ],
     "_prefab": null,
@@ -180254,16 +180366,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 4919
+      "__id__": 4922
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4921
+        "__id__": 4924
       },
       {
-        "__id__": 4922
+        "__id__": 4925
       }
     ],
     "_prefab": null,
@@ -180302,7 +180414,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4920
+      "__id__": 4923
     },
     "_enabled": true,
     "__prefab": null,
@@ -180324,7 +180436,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4920
+      "__id__": 4923
     },
     "_enabled": true,
     "__prefab": null,
@@ -180363,7 +180475,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4919
+      "__id__": 4922
     },
     "_enabled": true,
     "__prefab": null,
@@ -180385,7 +180497,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4919
+      "__id__": 4922
     },
     "_enabled": true,
     "__prefab": null,
@@ -180424,7 +180536,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4919
+      "__id__": 4922
     },
     "_enabled": true,
     "__prefab": null,
@@ -180454,15 +180566,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4919
+      "__id__": 4922
     },
     "_enabled": true,
     "__prefab": null,
     "_scrollView": {
-      "__id__": 4927
+      "__id__": 4930
     },
     "_handle": {
-      "__id__": 4922
+      "__id__": 4925
     },
     "_direction": 1,
     "_enableAutoHide": false,
@@ -180475,7 +180587,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4918
+      "__id__": 4921
     },
     "_enabled": true,
     "__prefab": null,
@@ -180488,11 +180600,11 @@
     "cancelInnerEvents": true,
     "scrollEvents": [],
     "_content": {
-      "__id__": 4928
+      "__id__": 4931
     },
     "_horizontalScrollBar": null,
     "_verticalScrollBar": {
-      "__id__": 4926
+      "__id__": 4929
     },
     "_id": "2d/9gdAa5MuK0JoJRR/WwL"
   },
@@ -180502,19 +180614,19 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 4929
+      "__id__": 4932
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4934
+        "__id__": 4937
       },
       {
-        "__id__": 4935
+        "__id__": 4938
       },
       {
-        "__id__": 4936
+        "__id__": 4939
       }
     ],
     "_prefab": null,
@@ -180553,26 +180665,26 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 4918
+      "__id__": 4921
     },
     "_children": [
       {
-        "__id__": 4928
+        "__id__": 4931
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 4930
+        "__id__": 4933
       },
       {
-        "__id__": 4931
+        "__id__": 4934
       },
       {
-        "__id__": 4932
+        "__id__": 4935
       },
       {
-        "__id__": 4933
+        "__id__": 4936
       }
     ],
     "_prefab": null,
@@ -180611,7 +180723,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4929
+      "__id__": 4932
     },
     "_enabled": true,
     "__prefab": null,
@@ -180633,7 +180745,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4929
+      "__id__": 4932
     },
     "_enabled": true,
     "__prefab": null,
@@ -180649,7 +180761,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4929
+      "__id__": 4932
     },
     "_enabled": true,
     "__prefab": null,
@@ -180689,7 +180801,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4929
+      "__id__": 4932
     },
     "_enabled": true,
     "__prefab": null,
@@ -180719,7 +180831,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4928
+      "__id__": 4931
     },
     "_enabled": true,
     "__prefab": null,
@@ -180741,7 +180853,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4928
+      "__id__": 4931
     },
     "_enabled": true,
     "__prefab": null,
@@ -180771,7 +180883,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4928
+      "__id__": 4931
     },
     "_enabled": true,
     "__prefab": null,
@@ -180803,7 +180915,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4918
+      "__id__": 4921
     },
     "_enabled": true,
     "__prefab": null,
@@ -180825,7 +180937,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4918
+      "__id__": 4921
     },
     "_enabled": true,
     "__prefab": null,
@@ -180868,22 +180980,22 @@
     },
     "_children": [
       {
-        "__id__": 4940
+        "__id__": 4943
       },
       {
-        "__id__": 4947
+        "__id__": 4950
       },
       {
-        "__id__": 4950
+        "__id__": 4953
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 4957
+        "__id__": 4960
       },
       {
-        "__id__": 4958
+        "__id__": 4961
       }
     ],
     "_prefab": null,
@@ -180922,23 +181034,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 4939
+      "__id__": 4942
     },
     "_children": [
       {
-        "__id__": 4941
+        "__id__": 4944
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 4944
+        "__id__": 4947
       },
       {
-        "__id__": 4945
+        "__id__": 4948
       },
       {
-        "__id__": 4946
+        "__id__": 4949
       }
     ],
     "_prefab": null,
@@ -180977,16 +181089,16 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 4940
+      "__id__": 4943
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4942
+        "__id__": 4945
       },
       {
-        "__id__": 4943
+        "__id__": 4946
       }
     ],
     "_prefab": null,
@@ -181025,7 +181137,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4941
+      "__id__": 4944
     },
     "_enabled": true,
     "__prefab": null,
@@ -181047,7 +181159,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4941
+      "__id__": 4944
     },
     "_enabled": true,
     "__prefab": null,
@@ -181086,7 +181198,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4940
+      "__id__": 4943
     },
     "_enabled": true,
     "__prefab": null,
@@ -181108,7 +181220,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4940
+      "__id__": 4943
     },
     "_enabled": true,
     "__prefab": null,
@@ -181147,7 +181259,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4940
+      "__id__": 4943
     },
     "_enabled": true,
     "__prefab": null,
@@ -181201,7 +181313,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 4940
+      "__id__": 4943
     },
     "_id": "b23sJ4z0ZIcYudKuXkN+I3"
   },
@@ -181211,16 +181323,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 4939
+      "__id__": 4942
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4948
+        "__id__": 4951
       },
       {
-        "__id__": 4949
+        "__id__": 4952
       }
     ],
     "_prefab": null,
@@ -181259,7 +181371,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4947
+      "__id__": 4950
     },
     "_enabled": true,
     "__prefab": null,
@@ -181281,7 +181393,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4947
+      "__id__": 4950
     },
     "_enabled": true,
     "__prefab": null,
@@ -181320,23 +181432,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 4939
+      "__id__": 4942
     },
     "_children": [
       {
-        "__id__": 4951
+        "__id__": 4954
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 4954
+        "__id__": 4957
       },
       {
-        "__id__": 4955
+        "__id__": 4958
       },
       {
-        "__id__": 4956
+        "__id__": 4959
       }
     ],
     "_prefab": null,
@@ -181375,16 +181487,16 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 4950
+      "__id__": 4953
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4952
+        "__id__": 4955
       },
       {
-        "__id__": 4953
+        "__id__": 4956
       }
     ],
     "_prefab": null,
@@ -181423,7 +181535,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4951
+      "__id__": 4954
     },
     "_enabled": true,
     "__prefab": null,
@@ -181445,7 +181557,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4951
+      "__id__": 4954
     },
     "_enabled": true,
     "__prefab": null,
@@ -181484,7 +181596,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4950
+      "__id__": 4953
     },
     "_enabled": true,
     "__prefab": null,
@@ -181506,7 +181618,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4950
+      "__id__": 4953
     },
     "_enabled": true,
     "__prefab": null,
@@ -181545,7 +181657,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4950
+      "__id__": 4953
     },
     "_enabled": true,
     "__prefab": null,
@@ -181599,7 +181711,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 4950
+      "__id__": 4953
     },
     "_id": "71DoHeJHdNOKaluD1p7ROd"
   },
@@ -181609,7 +181721,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4939
+      "__id__": 4942
     },
     "_enabled": true,
     "__prefab": null,
@@ -181631,7 +181743,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4939
+      "__id__": 4942
     },
     "_enabled": true,
     "__prefab": null,
@@ -181817,24 +181929,27 @@
     },
     "_enabled": true,
     "__prefab": null,
+    "version": {
+      "__id__": 4915
+    },
     "content": {
-      "__id__": 4928
+      "__id__": 4931
     },
     "item": {
       "__uuid__": "a9319801-40ea-439a-96b2-a835d0fde80c",
       "__expectedType__": "cc.Prefab"
     },
     "page_number": {
-      "__id__": 4939
+      "__id__": 4942
     },
     "btn_previous_page": {
-      "__id__": 4940
+      "__id__": 4943
     },
     "lab_current_page": {
-      "__id__": 4947
+      "__id__": 4950
     },
     "btn_next_page": {
-      "__id__": 4950
+      "__id__": 4953
     },
     "_id": "d91gTKbHZHK5Dk9KpEQ1Pe"
   },
@@ -181850,13 +181965,13 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 4966
+        "__id__": 4969
       },
       {
-        "__id__": 4967
+        "__id__": 4970
       },
       {
-        "__id__": 4968
+        "__id__": 4971
       }
     ],
     "_prefab": null,
@@ -181895,7 +182010,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4965
+      "__id__": 4968
     },
     "_enabled": true,
     "__prefab": null,
@@ -181917,7 +182032,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4965
+      "__id__": 4968
     },
     "_enabled": true,
     "__prefab": null,
@@ -181947,7 +182062,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4965
+      "__id__": 4968
     },
     "_enabled": true,
     "__prefab": null,
@@ -181965,13 +182080,13 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 4970
+        "__id__": 4973
       },
       {
-        "__id__": 4971
+        "__id__": 4974
       },
       {
-        "__id__": 4972
+        "__id__": 4975
       }
     ],
     "_prefab": null,
@@ -182010,7 +182125,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4969
+      "__id__": 4972
     },
     "_enabled": true,
     "__prefab": null,
@@ -182032,7 +182147,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4969
+      "__id__": 4972
     },
     "_enabled": true,
     "__prefab": null,
@@ -182062,7 +182177,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 4969
+      "__id__": 4972
     },
     "_enabled": true,
     "__prefab": null,
@@ -182159,10 +182274,10 @@
       "__id__": 557
     },
     "action_node": {
-      "__id__": 4965
+      "__id__": 4968
     },
     "res_action_node": {
-      "__id__": 4969
+      "__id__": 4972
     },
     "attributes_node": {
       "__id__": 558
@@ -182180,28 +182295,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 4979
+      "__id__": 4982
     },
     "shadows": {
-      "__id__": 4980
+      "__id__": 4983
     },
     "_skybox": {
-      "__id__": 4981
+      "__id__": 4984
     },
     "fog": {
-      "__id__": 4982
+      "__id__": 4985
     },
     "octree": {
-      "__id__": 4983
+      "__id__": 4986
     },
     "skin": {
-      "__id__": 4984
+      "__id__": 4987
     },
     "lightProbeInfo": {
-      "__id__": 4985
+      "__id__": 4988
     },
     "postSettings": {
-      "__id__": 4986
+      "__id__": 4989
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

+ 1 - 0
assets/script/config.ts

@@ -5,6 +5,7 @@ const { ccclass, property } = _decorator;
 export class config {
     static debug = true;
     static domain = "https://zcapi.xwrun.com";
+    static version = 'v2.0'
     static is_MAC_edit = false; //目前临时处理:如果是Mac并且浏览器打开了检查时设置为true,正式打包需要设置为false
     static select_res_and_control_type = {
         RES_TYPE:0,

+ 2 - 1
assets/script/edit/level_list.ts

@@ -8,7 +8,7 @@ const { ccclass, property } = _decorator;
 
 @ccclass('level_list')
 export class level_list extends Component {
-
+    @property(Node) version:Node = null;
     @property(Node) content:Node = null;
     @property(Prefab) item:Prefab = null;
     @property(Node) page_number:Node = null;
@@ -24,6 +24,7 @@ export class level_list extends Component {
     private m_prefab_node_list:Node[] = [];
 
     protected start(): void {
+        this.version.getComponent(Label).string = config.version
         this.page_number.active = false
         let self = this
         this.btn_previous_page.on(Node.EventType.TOUCH_END, ()=> {