装备属性的调整，实现装备与数据的对接

assets/resources/prefab/Items/Belt/Item_belt_2.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_belt_2",
+    "_name": "Item_belt_4",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 93
+      "width": 92,
+      "height": 41
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "00275fad-8cc9-45db-86e9-b7992d00a2c3"
+      "__uuid__": "a48dd269-605e-4e7b-99b1-2d925d43b5d1"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -119,7 +119,7 @@
     },
     "_enabled": true,
     "items_type": 4,
-    "gradetype": 1,
+    "gradetype": 3,
     "argutype": 2,
     "_id": ""
   },
@@ -129,7 +129,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "ed208882-ac9b-476c-9064-b815e18b7ed6"
+      "__uuid__": "b5d18691-8194-4afa-9bbe-221c61ee1fa4"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Belt/Item_belt_2.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "ed208882-ac9b-476c-9064-b815e18b7ed6",
+  "uuid": "b5d18691-8194-4afa-9bbe-221c61ee1fa4",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Belt/Item_belt_4.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_belt_4",
+    "_name": "Item_belt_2",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 92,
-      "height": 41
+      "width": 100,
+      "height": 93
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "a48dd269-605e-4e7b-99b1-2d925d43b5d1"
+      "__uuid__": "00275fad-8cc9-45db-86e9-b7992d00a2c3"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -119,7 +119,7 @@
     },
     "_enabled": true,
     "items_type": 4,
-    "gradetype": 3,
+    "gradetype": 1,
     "argutype": 2,
     "_id": ""
   },
@@ -129,7 +129,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "b5d18691-8194-4afa-9bbe-221c61ee1fa4"
+      "__uuid__": "ed208882-ac9b-476c-9064-b815e18b7ed6"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Belt/Item_belt_4.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "b5d18691-8194-4afa-9bbe-221c61ee1fa4",
+  "uuid": "ed208882-ac9b-476c-9064-b815e18b7ed6",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/DownLoad/Item_download_2.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_download_2",
+    "_name": "Item_download_4",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -42,8 +42,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 96,
-      "height": 95
+      "width": 81,
+      "height": 81
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -95,7 +95,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "b72f6ca1-ea9d-4d33-a865-38c10f23968a"
+      "__uuid__": "b527a9fa-b454-4828-9a2c-81c8e06d6ddf"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -120,7 +120,7 @@
     },
     "_enabled": true,
     "items_type": 3,
-    "gradetype": 1,
+    "gradetype": 3,
     "argutype": 0,
     "_id": ""
   },
@@ -143,7 +143,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "2a32b4a6-4fff-46e1-8188-64f47608b147"
+      "__uuid__": "64c3d9e5-265b-412a-8e33-06a64c6515e5"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/DownLoad/Item_download_2.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "2a32b4a6-4fff-46e1-8188-64f47608b147",
+  "uuid": "64c3d9e5-265b-412a-8e33-06a64c6515e5",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/DownLoad/Item_download_4.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_download_4",
+    "_name": "Item_download_2",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -42,8 +42,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 81,
-      "height": 81
+      "width": 96,
+      "height": 95
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -95,7 +95,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "b527a9fa-b454-4828-9a2c-81c8e06d6ddf"
+      "__uuid__": "b72f6ca1-ea9d-4d33-a865-38c10f23968a"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -120,7 +120,7 @@
     },
     "_enabled": true,
     "items_type": 3,
-    "gradetype": 3,
+    "gradetype": 1,
     "argutype": 0,
     "_id": ""
   },
@@ -143,7 +143,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "64c3d9e5-265b-412a-8e33-06a64c6515e5"
+      "__uuid__": "2a32b4a6-4fff-46e1-8188-64f47608b147"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/DownLoad/Item_download_4.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "64c3d9e5-265b-412a-8e33-06a64c6515e5",
+  "uuid": "2a32b4a6-4fff-46e1-8188-64f47608b147",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Gloves_Left/Item_left_gloves_2.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_left_gloves_2",
+    "_name": "Item_left_gloves_4",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 105,
-      "height": 102
+      "width": 86,
+      "height": 74
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "379b48c2-de70-4a61-9d69-b279098d0dd8"
+      "__uuid__": "7d8e0ca5-83b0-448d-8270-74451617ce5c"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 0,
-    "gradetype": 1,
+    "gradetype": 3,
     "argutype": 3,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "1b7974ff-995b-499f-83c2-e962a16331d0"
+      "__uuid__": "226a76a6-719d-4fe2-abf8-0ccd7ed3a0c4"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Gloves_Left/Item_left_gloves_2.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "1b7974ff-995b-499f-83c2-e962a16331d0",
+  "uuid": "226a76a6-719d-4fe2-abf8-0ccd7ed3a0c4",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Gloves_Left/Item_left_gloves_4.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_left_gloves_4",
+    "_name": "Item_left_gloves_2",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 86,
-      "height": 74
+      "width": 105,
+      "height": 102
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "7d8e0ca5-83b0-448d-8270-74451617ce5c"
+      "__uuid__": "379b48c2-de70-4a61-9d69-b279098d0dd8"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 0,
-    "gradetype": 3,
+    "gradetype": 1,
     "argutype": 3,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "226a76a6-719d-4fe2-abf8-0ccd7ed3a0c4"
+      "__uuid__": "1b7974ff-995b-499f-83c2-e962a16331d0"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Gloves_Left/Item_left_gloves_4.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "226a76a6-719d-4fe2-abf8-0ccd7ed3a0c4",
+  "uuid": "1b7974ff-995b-499f-83c2-e962a16331d0",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Gloves_Right/Item_right_gloves_2.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_right_gloves_2",
+    "_name": "Item_right_gloves_4",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 106,
-      "height": 101
+      "width": 85,
+      "height": 74
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "c9b676a1-7883-4cbe-a88a-a0d396102478"
+      "__uuid__": "a2ae160a-49a1-4f3c-aca8-504cdc06a60a"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 1,
-    "gradetype": 0,
+    "gradetype": 3,
     "argutype": 5,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "65572838-57a7-4c35-b6cb-202a6e51c5e3"
+      "__uuid__": "2747d295-e5dc-4789-b07c-c980e4a184e8"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Gloves_Right/Item_right_gloves_2.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "65572838-57a7-4c35-b6cb-202a6e51c5e3",
+  "uuid": "2747d295-e5dc-4789-b07c-c980e4a184e8",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Gloves_Right/Item_right_gloves_4.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_right_gloves_4",
+    "_name": "Item_right_gloves_2",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 85,
-      "height": 74
+      "width": 106,
+      "height": 101
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "a2ae160a-49a1-4f3c-aca8-504cdc06a60a"
+      "__uuid__": "c9b676a1-7883-4cbe-a88a-a0d396102478"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 1,
-    "gradetype": 3,
+    "gradetype": 0,
     "argutype": 5,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "2747d295-e5dc-4789-b07c-c980e4a184e8"
+      "__uuid__": "65572838-57a7-4c35-b6cb-202a6e51c5e3"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Gloves_Right/Item_right_gloves_4.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "2747d295-e5dc-4789-b07c-c980e4a184e8",
+  "uuid": "65572838-57a7-4c35-b6cb-202a6e51c5e3",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Helm/Item_helm_2.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_helm_2",
+    "_name": "Item_helm_4",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 89,
-      "height": 90
+      "width": 68,
+      "height": 72
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "6cd56503-38e6-4df0-a1b8-74eb7c90cc41"
+      "__uuid__": "90d55b36-f055-43a3-8b6f-43e8ebe632c1"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 5,
-    "gradetype": 1,
+    "gradetype": 3,
     "argutype": 8,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "b7482e9c-d218-49ad-b1b7-23d6d4ae2025"
+      "__uuid__": "4bd8b9e7-a718-4c3a-90c2-94ba246d6239"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Helm/Item_helm_2.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "b7482e9c-d218-49ad-b1b7-23d6d4ae2025",
+  "uuid": "4bd8b9e7-a718-4c3a-90c2-94ba246d6239",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Helm/Item_helm_4.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_helm_4",
+    "_name": "Item_helm_2",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 68,
-      "height": 72
+      "width": 89,
+      "height": 90
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "90d55b36-f055-43a3-8b6f-43e8ebe632c1"
+      "__uuid__": "6cd56503-38e6-4df0-a1b8-74eb7c90cc41"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 5,
-    "gradetype": 3,
+    "gradetype": 1,
     "argutype": 8,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "4bd8b9e7-a718-4c3a-90c2-94ba246d6239"
+      "__uuid__": "b7482e9c-d218-49ad-b1b7-23d6d4ae2025"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Helm/Item_helm_4.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "4bd8b9e7-a718-4c3a-90c2-94ba246d6239",
+  "uuid": "b7482e9c-d218-49ad-b1b7-23d6d4ae2025",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Kneelet/Item_kneelet_2.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_kneelet_2",
+    "_name": "Item_kneelet_4",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 94,
-      "height": 90
+      "width": 82,
+      "height": 72
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "69520521-768a-4127-93a1-cfe0f4c9f60b"
+      "__uuid__": "9d7802eb-94ac-4b5c-96c1-af8ffc9c9dd9"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 9,
-    "gradetype": 0,
+    "gradetype": 3,
     "argutype": 9,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "091fde69-96d1-4e22-98de-9b6ed810fc43"
+      "__uuid__": "6e17caf0-8567-4d7c-982b-f9fe6e38b48c"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Kneelet/Item_kneelet_2.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "091fde69-96d1-4e22-98de-9b6ed810fc43",
+  "uuid": "6e17caf0-8567-4d7c-982b-f9fe6e38b48c",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Kneelet/Item_kneelet_4.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_kneelet_4",
+    "_name": "Item_kneelet_2",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 82,
-      "height": 72
+      "width": 94,
+      "height": 90
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "9d7802eb-94ac-4b5c-96c1-af8ffc9c9dd9"
+      "__uuid__": "69520521-768a-4127-93a1-cfe0f4c9f60b"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 9,
-    "gradetype": 3,
+    "gradetype": 0,
     "argutype": 9,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "6e17caf0-8567-4d7c-982b-f9fe6e38b48c"
+      "__uuid__": "091fde69-96d1-4e22-98de-9b6ed810fc43"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Kneelet/Item_kneelet_4.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "6e17caf0-8567-4d7c-982b-f9fe6e38b48c",
+  "uuid": "091fde69-96d1-4e22-98de-9b6ed810fc43",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Necklace/Item_necklace_2.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_necklace_2",
+    "_name": "Item_necklace_4",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 101,
-      "height": 100
+      "width": 88,
+      "height": 93
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "e4a9cf21-4104-477f-9624-8595da9f5627"
+      "__uuid__": "3d163bef-be32-44a1-9e04-8f076bbd6321"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 6,
-    "gradetype": 1,
+    "gradetype": 3,
     "argutype": 6,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "e8cb45ac-0861-4ea5-af6a-1a0a754ddf66"
+      "__uuid__": "7389de78-47d7-422d-ac72-d89542d96b44"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Necklace/Item_necklace_2.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "e8cb45ac-0861-4ea5-af6a-1a0a754ddf66",
+  "uuid": "7389de78-47d7-422d-ac72-d89542d96b44",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Necklace/Item_necklace_4.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_necklace_4",
+    "_name": "Item_necklace_2",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 88,
-      "height": 93
+      "width": 101,
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "3d163bef-be32-44a1-9e04-8f076bbd6321"
+      "__uuid__": "e4a9cf21-4104-477f-9624-8595da9f5627"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 6,
-    "gradetype": 3,
+    "gradetype": 1,
     "argutype": 6,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "7389de78-47d7-422d-ac72-d89542d96b44"
+      "__uuid__": "e8cb45ac-0861-4ea5-af6a-1a0a754ddf66"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Necklace/Item_necklace_4.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "7389de78-47d7-422d-ac72-d89542d96b44",
+  "uuid": "e8cb45ac-0861-4ea5-af6a-1a0a754ddf66",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Shoe/Item_shoe_2.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_shoe_2",
+    "_name": "Item_shoe_4",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 97,
-      "height": 93
+      "width": 85,
+      "height": 81
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "df65a37a-4f44-4e98-b7aa-cfd37b84c9db"
+      "__uuid__": "634f3bb8-9748-4c39-a509-b734d2053141"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 7,
-    "gradetype": 1,
+    "gradetype": 3,
     "argutype": 7,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "c54e510e-1ec8-46e2-a579-ab1955528781"
+      "__uuid__": "eef166a7-c038-4da7-a486-05194c887745"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Shoe/Item_shoe_2.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "c54e510e-1ec8-46e2-a579-ab1955528781",
+  "uuid": "eef166a7-c038-4da7-a486-05194c887745",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Shoe/Item_shoe_4.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_shoe_4",
+    "_name": "Item_shoe_2",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 85,
-      "height": 81
+      "width": 97,
+      "height": 93
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "634f3bb8-9748-4c39-a509-b734d2053141"
+      "__uuid__": "df65a37a-4f44-4e98-b7aa-cfd37b84c9db"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 7,
-    "gradetype": 3,
+    "gradetype": 1,
     "argutype": 7,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "eef166a7-c038-4da7-a486-05194c887745"
+      "__uuid__": "c54e510e-1ec8-46e2-a579-ab1955528781"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Shoe/Item_shoe_4.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "eef166a7-c038-4da7-a486-05194c887745",
+  "uuid": "c54e510e-1ec8-46e2-a579-ab1955528781",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/TopLoad/Item_topload_2.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_topload_2",
+    "_name": "Item_topload_4",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 93,
-      "height": 94
+      "width": 85,
+      "height": 87
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "50139fa9-da2c-4036-9613-8ccd5ae5d951"
+      "__uuid__": "6116b05e-76b6-4053-8f23-f64478e3ce31"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 2,
-    "gradetype": 1,
+    "gradetype": 3,
     "argutype": 4,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "e0d99010-5c16-4286-99e2-552a27a8b0c9"
+      "__uuid__": "106a909d-c0ba-473e-b2da-d31cb4944afc"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/TopLoad/Item_topload_2.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "e0d99010-5c16-4286-99e2-552a27a8b0c9",
+  "uuid": "106a909d-c0ba-473e-b2da-d31cb4944afc",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/TopLoad/Item_topload_4.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_topload_4",
+    "_name": "Item_topload_2",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 85,
-      "height": 87
+      "width": 93,
+      "height": 94
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "6116b05e-76b6-4053-8f23-f64478e3ce31"
+      "__uuid__": "50139fa9-da2c-4036-9613-8ccd5ae5d951"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 2,
-    "gradetype": 3,
+    "gradetype": 1,
     "argutype": 4,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "106a909d-c0ba-473e-b2da-d31cb4944afc"
+      "__uuid__": "e0d99010-5c16-4286-99e2-552a27a8b0c9"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/TopLoad/Item_topload_4.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "106a909d-c0ba-473e-b2da-d31cb4944afc",
+  "uuid": "e0d99010-5c16-4286-99e2-552a27a8b0c9",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Wrist_support/Item_wrist_support_2.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_wrist_support_2",
+    "_name": "Item_wrist_support_4",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 92,
-      "height": 91
+      "width": 76,
+      "height": 68
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "fc411640-483b-4c5e-ace2-121fb5bd8d81"
+      "__uuid__": "b7e3e50f-3079-4d61-a7f2-c0aba8c81fe9"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 8,
-    "gradetype": 1,
+    "gradetype": 3,
     "argutype": 10,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "5c74fe08-aa47-4fd1-84f8-ba3f393d5326"
+      "__uuid__": "65d7e8dc-c3f8-4f7a-bff7-0b612ab78656"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Wrist_support/Item_wrist_support_2.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "5c74fe08-aa47-4fd1-84f8-ba3f393d5326",
+  "uuid": "65d7e8dc-c3f8-4f7a-bff7-0b612ab78656",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Items/Wrist_support/Item_wrist_support_4.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Item_wrist_support_4",
+    "_name": "Item_wrist_support_2",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -39,8 +39,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 76,
-      "height": 68
+      "width": 92,
+      "height": 91
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -92,7 +92,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "b7e3e50f-3079-4d61-a7f2-c0aba8c81fe9"
+      "__uuid__": "fc411640-483b-4c5e-ace2-121fb5bd8d81"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -117,7 +117,7 @@
     },
     "_enabled": true,
     "items_type": 8,
-    "gradetype": 3,
+    "gradetype": 1,
     "argutype": 10,
     "_id": ""
   },
@@ -127,7 +127,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "65d7e8dc-c3f8-4f7a-bff7-0b612ab78656"
+      "__uuid__": "5c74fe08-aa47-4fd1-84f8-ba3f393d5326"
     },
     "fileId": "",
     "sync": false

assets/resources/prefab/Items/Wrist_support/Item_wrist_support_4.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "65d7e8dc-c3f8-4f7a-bff7-0b612ab78656",
+  "uuid": "5c74fe08-aa47-4fd1-84f8-ba3f393d5326",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/Pass/Interface_Game_1.prefab

@@ -2839,7 +2839,7 @@
       }
     ],
     "_armatureName": "qiushuige",
-    "_animationName": "",
+    "_animationName": "idle",
     "_preCacheMode": 0,
     "_cacheMode": 0,
     "playTimes": 0,
@@ -2858,7 +2858,7 @@
       "__uuid__": "c8c8ee92-26f6-440e-9136-704f827a84a5"
     },
     "_N$_defaultArmatureIndex": 0,
-    "_N$_animationIndex": 0,
+    "_N$_animationIndex": 4,
     "_N$_defaultCacheMode": 0,
     "_N$timeScale": 1,
     "_N$debugBones": false,

assets/resources/prefab/Result/interface_Box.prefab

@@ -2053,6 +2053,9 @@
     "itemMaster": {
       "__id__": 29
     },
+    "sprite": {
+      "__id__": 21
+    },
     "mesh": {
       "__id__": 3
     },

assets/script/Game/Ai/AiPlayerController.js

@@ -1,5 +1,5 @@
 cc.Class({
-    extends: require("BasePlayerController"),
+    extends: require("BaseAiPlayerController"),
 
     properties: {
         charactor: cc.Node,

assets/script/Game/Ai/AiPlayerStates.js

@@ -1,5 +1,5 @@
 cc.Class({
-    extends: require("BasePlayerStates"),
+    extends: require("BaseAiPlayerStates"),
 
     properties: {
         playerController: cc.Node,

assets/script/Game/Base/BaseItemConstroller.js

@@ -47,34 +47,50 @@ cc.Class({
             this.item_name = "左手拳套";
             this.item_grade = 0;
             this.item_master_type = "攻击"; //主属性类型
+
             //白   * （白色装备：主属性1）
             if (gradetype == 0) {
+                this.spriteFrame_name = "left_gloves1";
                 this.item_master_value = 1;
                 this.item_Attached_num = 0; //附属属性数量
-                this.item_Attached_type = 0; //10种类型附属属性
-                this.item_Attached_value = 0; //附属属性类型值
+                if (this.item_Attached_num == 0) return;
+                else {
+                    for (let i = 0; i < this.item_Attached_num; i++) {
+                        this.item_Attached_type[i] = 0; //10种类型附属属性
+
+                        this.item_Attached_value[i] = 0; //附属属性类型值
+                    }
+                }
+
             }
             //* （绿色装备：主属性随机1-2，随机一条副属性1-1）
             //绿 主属性值随机1-2  随机副属性条数 副属性随机属性  副属性随机属性值
             if (gradetype == 1) {
+                this.spriteFrame_name = "left_gloves2";
                 this.item_master_value = this.random_num(1, 2); //主属性值
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 1); //附属属性类型值
+
             }
             //蓝* （蓝色装备：主属性随机1-3，随机一条副属性1-2）
             if (gradetype == 2) {
+                this.spriteFrame_name = "left_gloves3";
                 this.item_master_value = this.random_num(1, 3); //主属性值
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 2); //附属属性类型值
+
             }
             //黄  * （黄色装备：主属性随机1-4，随机两条副属性1-3）
             if (gradetype == 3) {
+                this.spriteFrame_name = "left_gloves4";
                 this.item_master_value = this.random_num(1, 4); //主属性值
                 this.item_Attached_num = this.random_num(2, 2); //附属属性数量
+
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 3); //附属属性类型值
+
             }
             //红 * （红色装备：主属性随机1-5，随机三条副属性1-4）
             if (gradetype == 4) {
@@ -82,6 +98,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(3, 3); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 4); //附属属性类型值
+                this.spriteFrame_name = "left_gloves5";
             }
         }
         if (item_type == 1) {
@@ -89,7 +106,13 @@ cc.Class({
             this.item_grade = 0;
             this.item_master_type = "连击率"; //主属性类型
             //白   * （白色装备：主属性1）
-            if (gradetype == 0) { this.item_master_value = 1; }
+            if (gradetype == 0) {
+                this.item_master_value = 1;
+                this.item_Attached_num = 0; //附属属性数量
+                this.item_Attached_type = 0; //10种类型附属属性
+                this.item_Attached_value = 0; //附属属性类型值
+                this.spriteFrame_name = "right_gloves1";
+            }
             //* （绿色装备：主属性随机1-2，随机一条副属性1-1）
             //绿 主属性值随机1-2  随机副属性条数 副属性随机属性  副属性随机属性值
             if (gradetype == 1) {
@@ -97,6 +120,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 1); //附属属性类型值
+                this.spriteFrame_name = "right_gloves2";
             }
             //蓝* （蓝色装备：主属性随机1-3，随机一条副属性1-2）
             if (gradetype == 2) {
@@ -104,6 +128,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 2); //附属属性类型值
+                this.spriteFrame_name = "right_gloves3";
             }
             //黄  * （黄色装备：主属性随机1-4，随机两条副属性1-3）
             if (gradetype == 3) {
@@ -111,6 +136,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(2, 2); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 3); //附属属性类型值
+                this.spriteFrame_name = "right_gloves4";
             }
             //红 * （红色装备：主属性随机1-5，随机三条副属性1-4）
             if (gradetype == 4) {
@@ -118,6 +144,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(3, 3); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 4); //附属属性类型值
+                this.spriteFrame_name = "right_gloves5";
             }
         }
         if (item_type == 2) {
@@ -125,7 +152,13 @@ cc.Class({
             this.item_grade = 0;
             this.item_master_type = "防御"; //主属性类型
             //白   * （白色装备：主属性1）
-            if (gradetype == 0) { this.item_master_value = 1; }
+            if (gradetype == 0) {
+                this.item_master_value = 1;
+                this.item_Attached_num = 0; //附属属性数量
+                this.item_Attached_type = 0; //10种类型附属属性
+                this.item_Attached_value = 0; //附属属性类型值
+                this.spriteFrame_name = "clothes1";
+            }
             //* （绿色装备：主属性随机1-2，随机一条副属性1-1）
             //绿 主属性值随机1-2  随机副属性条数 副属性随机属性  副属性随机属性值
             if (gradetype == 1) {
@@ -133,6 +166,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 1); //附属属性类型值
+                this.spriteFrame_name = "clothes2";
             }
             //蓝* （蓝色装备：主属性随机1-3，随机一条副属性1-2）
             if (gradetype == 2) {
@@ -140,6 +174,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 2); //附属属性类型值
+                this.spriteFrame_name = "clothes3";
             }
             //黄  * （黄色装备：主属性随机1-4，随机两条副属性1-3）
             if (gradetype == 3) {
@@ -147,6 +182,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(2, 2); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 3); //附属属性类型值
+                this.spriteFrame_name = "clothes4";
             }
             //红 * （红色装备：主属性随机1-5，随机三条副属性1-4）
             if (gradetype == 4) {
@@ -154,6 +190,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(3, 3); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 4); //附属属性类型值
+                this.spriteFrame_name = "clothes5";
             }
         }
         if (item_type == 3) {
@@ -161,7 +198,13 @@ cc.Class({
             this.item_grade = 0;
             this.item_master_type = "血量"; //主属性类型
             //白   * （白色装备：主属性1）
-            if (gradetype == 0) { this.item_master_value = 1; }
+            if (gradetype == 0) {
+                this.item_master_value = 1;
+                this.item_Attached_num = 0; //附属属性数量
+                this.item_Attached_type = 0; //10种类型附属属性
+                this.item_Attached_value = 0; //附属属性类型值
+                this.spriteFrame_name = "trousers1";
+            }
             //* （绿色装备：主属性随机1-2，随机一条副属性1-1）
             //绿 主属性值随机1-2  随机副属性条数 副属性随机属性  副属性随机属性值
             if (gradetype == 1) {
@@ -169,6 +212,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 1); //附属属性类型值
+                this.spriteFrame_name = "trousers2";
             }
             //蓝* （蓝色装备：主属性随机1-3，随机一条副属性1-2）
             if (gradetype == 2) {
@@ -176,6 +220,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 2); //附属属性类型值
+                this.spriteFrame_name = "trousers3";
             }
             //黄  * （黄色装备：主属性随机1-4，随机两条副属性1-3）
             if (gradetype == 3) {
@@ -183,6 +228,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(2, 2); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 3); //附属属性类型值
+                this.spriteFrame_name = "trousers4";
             }
             //红 * （红色装备：主属性随机1-5，随机三条副属性1-4）
             if (gradetype == 4) {
@@ -190,6 +236,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(3, 3); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 4); //附属属性类型值
+                this.spriteFrame_name = "trousers5";
             }
         }
         if (item_type == 4) {
@@ -197,7 +244,13 @@ cc.Class({
             this.item_grade = 0;
             this.item_master_type = "蓝量"; //主属性类型
             //白   * （白色装备：主属性1）
-            if (gradetype == 0) { this.item_master_value = 1; }
+            if (gradetype == 0) {
+                this.item_master_value = 1;
+                this.item_Attached_num = 0; //附属属性数量
+                this.item_Attached_type = 0; //10种类型附属属性
+                this.item_Attached_value = 0; //附属属性类型值
+                this.spriteFrame_name = "belt1";
+            }
             //* （绿色装备：主属性随机1-2，随机一条副属性1-1）
             //绿 主属性值随机1-2  随机副属性条数 副属性随机属性  副属性随机属性值
             if (gradetype == 1) {
@@ -205,6 +258,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 1); //附属属性类型值
+                this.spriteFrame_name = "belt2";
             }
             //蓝* （蓝色装备：主属性随机1-3，随机一条副属性1-2）
             if (gradetype == 2) {
@@ -212,6 +266,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 2); //附属属性类型值
+                this.spriteFrame_name = "belt3";
             }
             //黄  * （黄色装备：主属性随机1-4，随机两条副属性1-3）
             if (gradetype == 3) {
@@ -219,6 +274,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(2, 2); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 3); //附属属性类型值
+                this.spriteFrame_name = "belt4";
             }
             //红 * （红色装备：主属性随机1-5，随机三条副属性1-4）
             if (gradetype == 4) {
@@ -226,6 +282,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(3, 3); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 4); //附属属性类型值
+                this.spriteFrame_name = "belt5";
             }
         }
         if (item_type == 5) {
@@ -233,7 +290,13 @@ cc.Class({
             this.item_grade = 0;
             this.item_master_type = "格挡回血量"; //主属性类型
             //白   * （白色装备：主属性1）
-            if (gradetype == 0) { this.item_master_value = 1; }
+            if (gradetype == 0) {
+                this.item_master_value = 1;
+                this.item_Attached_num = 0; //附属属性数量
+                this.item_Attached_type = 0; //10种类型附属属性
+                this.item_Attached_value = 0; //附属属性类型值
+                this.spriteFrame_name = "helmet1";
+            }
             //* （绿色装备：主属性随机1-2，随机一条副属性1-1）
             //绿 主属性值随机1-2  随机副属性条数 副属性随机属性  副属性随机属性值
             if (gradetype == 1) {
@@ -241,6 +304,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 1); //附属属性类型值
+                this.spriteFrame_name = "helmet2";
             }
             //蓝* （蓝色装备：主属性随机1-3，随机一条副属性1-2）
             if (gradetype == 2) {
@@ -248,6 +312,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 2); //附属属性类型值
+                this.spriteFrame_name = "helmet3";
             }
             //黄  * （黄色装备：主属性随机1-4，随机两条副属性1-3）
             if (gradetype == 3) {
@@ -255,6 +320,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(2, 2); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 3); //附属属性类型值
+                this.spriteFrame_name = "helmet4";
             }
             //红 * （红色装备：主属性随机1-5，随机三条副属性1-4）
             if (gradetype == 4) {
@@ -262,6 +328,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(3, 3); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 4); //附属属性类型值
+                this.spriteFrame_name = "helmet5";
             }
         }
         if (item_type == 6) {
@@ -269,7 +336,13 @@ cc.Class({
             this.item_grade = 0;
             this.item_master_type = "暴击率"; //主属性类型
             //白   * （白色装备：主属性1）
-            if (gradetype == 0) { this.item_master_value = 1; }
+            if (gradetype == 0) {
+                this.item_master_value = 1;
+                this.item_Attached_num = 0; //附属属性数量
+                this.item_Attached_type = 0; //10种类型附属属性
+                this.item_Attached_value = 0; //附属属性类型值
+                this.spriteFrame_name = "necklace1";
+            }
             //* （绿色装备：主属性随机1-2，随机一条副属性1-1）
             //绿 主属性值随机1-2  随机副属性条数 副属性随机属性  副属性随机属性值
             if (gradetype == 1) {
@@ -277,6 +350,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 1); //附属属性类型值
+                this.spriteFrame_name = "necklace2";
             }
             //蓝* （蓝色装备：主属性随机1-3，随机一条副属性1-2）
             if (gradetype == 2) {
@@ -284,6 +358,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 2); //附属属性类型值
+                this.spriteFrame_name = "necklace3";
             }
             //黄  * （黄色装备：主属性随机1-4，随机两条副属性1-3）
             if (gradetype == 3) {
@@ -291,6 +366,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(2, 2); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 3); //附属属性类型值
+                this.spriteFrame_name = "necklace4";
             }
             //红 * （红色装备：主属性随机1-5，随机三条副属性1-4）
             if (gradetype == 4) {
@@ -298,6 +374,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(3, 3); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 4); //附属属性类型值
+                this.spriteFrame_name = "necklace5";
             }
         }
         if (item_type == 7) {
@@ -305,7 +382,13 @@ cc.Class({
             this.item_grade = 0;
             this.item_master_type = "闪避回蓝量"; //主属性类型
             //白   * （白色装备：主属性1）
-            if (gradetype == 0) { this.item_master_value = 1; }
+            if (gradetype == 0) {
+                this.item_master_value = 1;
+                this.item_Attached_num = 0; //附属属性数量
+                this.item_Attached_type = 0; //10种类型附属属性
+                this.item_Attached_value = 0; //附属属性类型值
+                this.spriteFrame_name = "shoe1";
+            }
             //* （绿色装备：主属性随机1-2，随机一条副属性1-1）
             //绿 主属性值随机1-2  随机副属性条数 副属性随机属性  副属性随机属性值
             if (gradetype == 1) {
@@ -313,6 +396,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 1); //附属属性类型值
+                this.spriteFrame_name = "shoe2";
             }
             //蓝* （蓝色装备：主属性随机1-3，随机一条副属性1-2）
             if (gradetype == 2) {
@@ -320,6 +404,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 2); //附属属性类型值
+                this.spriteFrame_name = "shoe3";
             }
             //黄  * （黄色装备：主属性随机1-4，随机两条副属性1-3）
             if (gradetype == 3) {
@@ -327,6 +412,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(2, 2); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 3); //附属属性类型值
+                this.spriteFrame_name = "shoe4";
             }
             //红 * （红色装备：主属性随机1-5，随机三条副属性1-4）
             if (gradetype == 4) {
@@ -334,6 +420,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(3, 3); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 4); //附属属性类型值
+                this.spriteFrame_name = "shoe5";
             }
         }
         if (item_type == 8) {
@@ -341,7 +428,13 @@ cc.Class({
             this.item_grade = 0;
             this.item_master_type = "被动回蓝"; //主属性类型
             //白   * （白色装备：主属性1）
-            if (gradetype == 0) { this.item_master_value = 1; }
+            if (gradetype == 0) {
+                this.item_master_value = 1;
+                this.item_Attached_num = 0; //附属属性数量
+                this.item_Attached_type = 0; //10种类型附属属性
+                this.item_Attached_value = 0; //附属属性类型值
+                this.spriteFrame_name = "wristsupport1";
+            }
             //* （绿色装备：主属性随机1-2，随机一条副属性1-1）
             //绿 主属性值随机1-2  随机副属性条数 副属性随机属性  副属性随机属性值
             if (gradetype == 1) {
@@ -349,6 +442,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 1); //附属属性类型值
+                this.spriteFrame_name = "wristsupport2";
             }
             //蓝* （蓝色装备：主属性随机1-3，随机一条副属性1-2）
             if (gradetype == 2) {
@@ -356,6 +450,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 2); //附属属性类型值
+                this.spriteFrame_name = "wristsupport3";
             }
             //黄  * （黄色装备：主属性随机1-4，随机两条副属性1-3）
             if (gradetype == 3) {
@@ -363,6 +458,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(2, 2); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 3); //附属属性类型值
+                this.spriteFrame_name = "wristsupport4";
             }
             //红 * （红色装备：主属性随机1-5，随机三条副属性1-4）
             if (gradetype == 4) {
@@ -370,6 +466,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(3, 3); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 4); //附属属性类型值
+                this.spriteFrame_name = "wristsupport5";
             }
         }
         if (item_type == 9) {
@@ -377,7 +474,13 @@ cc.Class({
             this.item_grade = 0;
             this.item_master_type = "被动回血"; //主属性类型
             //白   * （白色装备：主属性1）
-            if (gradetype == 0) { this.item_master_value = 1; }
+            if (gradetype == 0) {
+                this.item_master_value = 1;
+                this.item_Attached_num = 0; //附属属性数量
+                this.item_Attached_type = 0; //10种类型附属属性
+                this.item_Attached_value = 0; //附属属性类型值
+                this.spriteFrame_name = "kneecap1";
+            }
             //* （绿色装备：主属性随机1-2，随机一条副属性1-1）
             //绿 主属性值随机1-2  随机副属性条数 副属性随机属性  副属性随机属性值
             if (gradetype == 1) {
@@ -385,6 +488,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 1); //附属属性类型值
+                this.spriteFrame_name = "kneecap2";
             }
             //蓝* （蓝色装备：主属性随机1-3，随机一条副属性1-2）
             if (gradetype == 2) {
@@ -392,6 +496,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(1, 1); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 2); //附属属性类型值
+                this.spriteFrame_name = "kneecap3";
             }
             //黄  * （黄色装备：主属性随机1-4，随机两条副属性1-3）
             if (gradetype == 3) {
@@ -399,6 +504,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(2, 2); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 3); //附属属性类型值
+                this.spriteFrame_name = "kneecap4";
             }
             //红 * （红色装备：主属性随机1-5，随机三条副属性1-4）
             if (gradetype == 4) {
@@ -406,6 +512,7 @@ cc.Class({
                 this.item_Attached_num = this.random_num(3, 3); //附属属性数量
                 this.item_Attached_type = this.random_num(0, 9); //10种类型附属属性
                 this.item_Attached_value = this.random_num(1, 4); //附属属性类型值
+                this.spriteFrame_name = "kneecap5";
             }
         }
     },
@@ -415,6 +522,19 @@ cc.Class({
     random_num(minnum, maxnum) {
         return Math.floor(Math.random() * (maxnum - minnum + 1)) + minnum;
     },
+
+    _item_name(itemnum) { //物品名字
+        if (itemnum == 0) return "左手拳套";
+        if (itemnum == 1) return "右手拳套";
+        if (itemnum == 2) return "衣服";
+        if (itemnum == 3) return "裤子";
+        if (itemnum == 4) return "腰带";
+        if (itemnum == 5) return "头盔";
+        if (itemnum == 6) return "项链";
+        if (itemnum == 7) return "鞋子";
+        if (itemnum == 8) return "手套";
+        if (itemnum == 9) return "护膝";
+    }
     // //随机品级
     // random_grade(maxnum) { //max 5
     //     return Math.floor(Math.random() * maxnum); //[0-4]

assets/script/Game/Base/BasePlayerStates.js

@@ -5,6 +5,7 @@ cc.Class({
 
     },
     onLoad() {
+        this.name = "曹英俊";
         this.hp = 330;
         this.maxhp = 330; //血量
         this.endurance = 100;
@@ -113,4 +114,5 @@ cc.Class({
     //     }
     // },
 
+
 });

assets/script/Game/GameMode.js

@@ -18,6 +18,7 @@ cc.Class({
 
         // });
         // }, 20);
+
     },
 
     start() {

assets/script/Game/Player/PlayerStates.js

@@ -1,5 +1,5 @@
 cc.Class({
-    extends: require("BasePlayerStates"),
+    extends: cc.Component,
 
     properties: {
         playerController: cc.Node,
@@ -20,24 +20,23 @@ cc.Class({
         //interface_game: cc.Node,
     },
     onLoad() {
+        this.init();
         this.game = cc.find("Canvas/Game");
 
         this.PanelResult = cc.find("Canvas/PanelResult");
-        this._super();
-        this._hp = this.hp;
-        this._maxhp = this.maxhp; //血量
-        this._endurance = this.endurance;
-        this._maxendurance = this.maxendurance; //蓝量
-        this._damage = this.damage; //攻击力
-        this._defense = this.defense; //防御
-        this._combo_rate = this.combo_rate; //连击率
-        this._crit_rate = this.crit_rate; //暴击率
-        this._dodge_endurance = this.dodge_endurance; //闪避回蓝
-        this._defense_hp = this.defense_hp; //格挡回血
-        this._recover_hp = this.recover_hp; //被动回血1/s
-        this._recover_endurance = this.recover_endurance; //被动回蓝1/s
-        this._block_minus_endurance = this.block_minus_endurance; //格挡减蓝量
-        this.init();
+        this._hp = this.Interface_Info.hp;
+        this._maxhp = this.Interface_Info.maxhp; //血量
+        this._endurance = this.Interface_Info.endurance;
+        this._maxendurance = this.Interface_Info.maxendurance; //蓝量
+        this._damage = this.Interface_Info.damage; //攻击力
+        this._defense = this.Interface_Info.defense; //防御
+        this._combo_rate = this.Interface_Info.combo_rate; //连击率
+        this._crit_rate = this.Interface_Info.crit_rate; //暴击率
+        this._dodge_endurance = this.Interface_Info.dodge_endurance; //闪避回蓝
+        this._defense_hp = this.Interface_Info.defense_hp; //格挡回血
+        this._recover_hp = this.Interface_Info.recover_hp; //被动回血1/s
+        this._recover_endurance = this.Interface_Info.recover_endurance; //被动回蓝1/s
+        this._block_minus_endurance = this.Interface_Info.block_minus_endurance; //格挡减蓝量
         //回复状态
         //this.oligemia();//继承BasePlayerStates函数
         this.Charactor.on("attack", () => {
@@ -62,44 +61,48 @@ cc.Class({
         this.Charactor.on("block", () => {
             //console.log("检测到防御");
             cc.audioEngine.playEffect(this.UiController.audioArr[1]);
-            this._endurance = this.minusendurance(this._endurance); //减蓝
-            this._hp = this.addblood(this._maxhp, this._hp, 1); //回血
+            this._endurance = this.Interface_Info.minusendurance(this._endurance); //减蓝
+            this._hp = this.Interface_Info.addblood(this._maxhp, this._hp, 1); //回血
             this.progressBar_hp.getComponent(cc.Sprite).fillRange = this._hp / this._maxhp;
             this.progressBar_endur.getComponent(cc.Sprite).fillRange = this._endurance / this._maxendurance;
         });
         this.Charactor.on("hurt_ord", () => {
 
             cc.audioEngine.playEffect(this.UiController.audioArr[4]);
-            this._hp = this.minusblood(this._hp);
+            this._hp = this.Interface_Info.minusblood(this._hp);
             this.progressBar_hp.getComponent(cc.Sprite).fillRange = this._hp / this._maxhp;
         });
         this.Charactor.on("hurt_critical", () => {
 
             cc.audioEngine.playEffect(this.UiController.audioArr[4]);
-            this._hp = this.minusblood_critical(this._hp);
+            this._hp = this.Interface_Info.minusblood_critical(this._hp);
             //console.log("暴击后的血量：", this._hp);
             this.progressBar_hp.getComponent(cc.Sprite).fillRange = this._hp / this._maxhp;
         });
         this.Charactor.on("hurt_double", () => {
 
             cc.audioEngine.playEffect(this.UiController.audioArr[4]);
-            this._hp = this.minusblood(this._hp);
+            this._hp = this.Interface_Info.minusblood(this._hp);
 
             this.progressBar_hp.getComponent(cc.Sprite).fillRange = this._hp / this._maxhp;
-            this._hp = this.minusblood(this._hp);
+            this._hp = this.Interface_Info.minusblood(this._hp);
             this.progressBar_hp.getComponent(cc.Sprite).fillRange = this._hp / this._maxhp;
 
         });
         //被动回血回蓝
         this.schedule(() => {
 
-            this._hp = this.addblood(this._maxhp, this._hp, 0);
-            this._endurance = this.addendurance(this._maxendurance, this._endurance, 0);
+            this._hp = this.Interface_Info.addblood(this._maxhp, this._hp, 0);
+            this._endurance = this.Interface_Info.addendurance(this._maxendurance, this._endurance, 0);
 
         }, 1);
     },
     start() {
-        this.init();
+
+        console.log("角色血量", this._hp);
+        console.log("角色伤害", this._damage);
+        console.log("角色防御", this._defense);
+        console.log("角色连击", this._combo_rate);
     },
     init() {
         this._GameState = cc.find("GameStates").getComponent("GameStates");
@@ -111,7 +114,7 @@ cc.Class({
         //this.playerStateScp = this.PlayerState.getComponent('PlayerStates');
         this.aiplayerStateScp = this.AiPlayerState.getComponent('AiPlayerStates');
         this.UiController = cc.find("Canvas/UiController").getComponent('UiController');
-
+        this.Interface_Info = cc.find("Canvas/Interface_Info").getComponent("Interface_Info"); //角色数据界面脚本
 
     },
     update(dt) {

assets/script/Game/Result/Box.js

@@ -13,6 +13,8 @@ cc.Class({
         itemGrade: cc.Label,
         itemMaster: cc.Label,
 
+        sprite: cc.Sprite,
+
         mesh: cc.Node,
 
     },
@@ -22,9 +24,13 @@ cc.Class({
     onLoad() {
         this._super();
         this.init();
+        this.item_attached_nameArr = [];
+        this.item_Attached_typeArr = [];
+        this.item_attached_valueArr = [];
         this.item_type = this.random_num(0, 9);
         this.gradetype = this.random_num(0, 4);
 
+
         this.generate_properties(this.item_type, this.gradetype);
 
         this.mesh.on(cc.Node.EventType.TOUCH_START, function() {
@@ -42,203 +48,103 @@ cc.Class({
 
     start() {
         cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").removeAllChildren();
-        this.itemName.string = this.item_name;
+        this.box_table();
+        //#region 
+        // cc.loader.loadRes("texture/AvatarProps", cc.SpriteFrame, function(err, spriteFrames) {
+        //     console.log("图集：", spriteFrames);
+        //     spriteFrames.forEach(function(element) {
+        //         if (element.name === this.spriteFrame_name) {
+        //             this.sprite.getComponent(cc.Sprite).spriteFrame = element;
+        //         }
+        //     });
+
+        // });
+        //#endregion
+    },
+    box_table() {
+        this.itemName.string = this.item_name; //名字
+        //#region 
         // if (this.item_grade < 5) this.itemGrade.node.color = cc.Color.WHITE;
         // else if(this.item_grade >= 5&&this.item_grade < 15)this.itemGrade.node.color = cc.Color.BLUE;
         // else if(this.item_grade >= 5&&this.item_grade < 15)this.itemGrade.node.color = cc.Color.BLUE;
         // else{this.itemGrade.node.color = cc.Color.RED;}
-        this.itemGrade.string = this.item_grade + "级";
-        this.itemMaster.string = this.item_master_type + '+' + this.item_master_value;
-
-        if (this.item_Attached_type == 0) {
-            this.item_Attached_type = "攻击";
-            this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value, this.item_Attached_num, this.item_Attached_type, this.item_Attached_value);
-            for (let i = 0; i < this.item_Attached_num; i++) {
-                let Attached_value = this.item_Attached_value;
-                console.log("附加属性", this.item_Attached_type);
-                var self = this;
-                cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
-                    console.log(self.item_Attached_num + "词条数");
-                    console.log(cc.instantiate(prefab) + "预设");
-                    let _attached = cc.instantiate(prefab);
-                    cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
-                    _attached.children[0].getComponent(cc.Label).string = self.item_Attached_type + '+' + Attached_value;
-                });
-            }
-        }
-        if (this.item_Attached_type == 1) {
-            this.item_Attached_type = "连击率";
-            this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value, this.item_Attached_num, this.item_Attached_type, this.item_Attached_value);
-            for (let i = 0; i < this.item_Attached_num; i++) {
-                let Attached_value = this.item_Attached_value;
-                console.log("附加属性", this.item_Attached_type);
-                var self = this;
-                cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
-                    console.log(self.item_Attached_num + "词条数");
-                    console.log(cc.instantiate(prefab) + "预设");
-                    let _attached = cc.instantiate(prefab);
-                    cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
-                    _attached.children[0].getComponent(cc.Label).string = self.item_Attached_type + '+' + Attached_value;
-
-                });
-            }
-            self.interfaceInfo.creatorItem(self.item_type, self.gradetype, self.item_master_type, self.item_master_value, self.item_Attached_num, self.item_Attached_type, self.item_Attached_value);
+        //#endregion
+        this.itemGrade.string = this.item_grade + "级"; //等级
+        this.itemMaster.string = this.item_master_type + '+' + this.item_master_value; //主属性+主属性数值
+        //物品图片
+        cc.resources.loadDir("texture/AvatarProps", cc.SpriteFrame, (err, spriteFrames) => {
+            // ...
+
+            spriteFrames.forEach((element) => {
+
+
+                if (element.name === this.spriteFrame_name) {
+
+                    this.sprite.getComponent(cc.Sprite).spriteFrame = element;
+
+                }
+            });
+        });
+        // if (this.item_Attached_num == 0) {
+        //     //物品类型 品级 主属性类型 主属性数值 
+        //     //        副属性条数  副属性类型  副属性数值
+        //     this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value,
+        //         this.item_Attached_num, this._prop_name(this.item_Attached_type), this.gradetype_value(this.gradetype));
+        //     return;
+        // } else {
+        for (let i = 0; i < this.item_Attached_num; i++) {
+            cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
+                this.item_Attached_type = this.random_num(0, 9);
+                // console.log(this.item_Attached_num + "++++词条数+");
+                // console.log(this.item_Attached_type + "+++++++随机值++++");
+                // console.log(this._prop_name(this.item_Attached_type) + "+++词条名字+");
+                // console.log(this.gradetype_value(this.gradetype) + "+++++词条数值+");
+                let _attached = cc.instantiate(prefab);
+
+                cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
+                _attached.children[0].getComponent(cc.Label).string = this._prop_name(this.item_Attached_type) + '+' + this.gradetype_value(this.gradetype);
+                this.item_Attached_typeArr[i] = this.item_Attached_type;
+                this.item_attached_nameArr[i] = this._prop_name(this.item_Attached_type);
+                this.item_attached_valueArr[i] = this.gradetype_value(this.gradetype);
+            });
         }
-        if (this.item_Attached_type == 2) {
-            this.item_Attached_type = "防御";
-            this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value, this.item_Attached_num, this.item_Attached_type, this.item_Attached_value);
-            for (let i = 0; i < this.item_Attached_num; i++) {
-
-                let Attached_value = this.item_Attached_value;
-
-                console.log("附加属性", this.item_Attached_type);
-                var self = this;
-                cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
-                    console.log(self.item_Attached_num + "词条数");
-                    console.log(cc.instantiate(prefab) + "预设");
-                    let _attached = cc.instantiate(prefab);
-                    cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
-                    _attached.children[0].getComponent(cc.Label).string = self.item_Attached_type + '+' + Attached_value;
-
-                });
-            }
-
-        }
-        if (this.item_Attached_type == 3) {
-            this.item_Attached_type = "血量";
-            this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value, this.item_Attached_num, this.item_Attached_type, this.item_Attached_value);
-            for (let i = 0; i < this.item_Attached_num; i++) {
-                let Attached_value = this.item_Attached_value;
-                console.log("附加属性", this.item_Attached_type);
-                var self = this;
-                cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
-                    console.log(self.item_Attached_num + "词条数");
-                    console.log(cc.instantiate(prefab) + "预设");
-                    let _attached = cc.instantiate(prefab);
-                    cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
-                    _attached.children[0].getComponent(cc.Label).string = self.item_Attached_type + '+' + Attached_value;
-
-                });
-            }
-
-        }
-        if (this.item_Attached_type == 4) {
-            this.item_Attached_type = "蓝量";
-            this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value, this.item_Attached_num, this.item_Attached_type, this.item_Attached_value);
-            for (let i = 0; i < this.item_Attached_num; i++) {
-                let Attached_value = this.item_Attached_value;
-                console.log("附加属性", this.item_Attached_type);
-                var self = this;
-                cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
-                    console.log(self.item_Attached_num + "词条数");
-                    console.log(cc.instantiate(prefab) + "预设");
-                    let _attached = cc.instantiate(prefab);
-                    cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
-                    _attached.children[0].getComponent(cc.Label).string = self.item_Attached_type + '+' + Attached_value;
-
-                });
-            }
-
-        }
-        if (this.item_Attached_type == 5) {
-            this.item_Attached_type = "格挡回血量";
-            this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value, this.item_Attached_num, this.item_Attached_type, this.item_Attached_value);
-            for (let i = 0; i < this.item_Attached_num; i++) {
-                let Attached_value = this.item_Attached_value;
-                console.log("附加属性", this.item_Attached_type);
-                var self = this;
-                cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
-                    console.log(self.item_Attached_num + "词条数");
-                    console.log(cc.instantiate(prefab) + "预设");
-                    let _attached = cc.instantiate(prefab);
-                    cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
-                    _attached.children[0].getComponent(cc.Label).string = self.item_Attached_type + '+' + Attached_value;
-
-                });
-            }
-
-        }
-        if (this.item_Attached_type == 6) {
-            this.item_Attached_type = "暴击率";
-            this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value, this.item_Attached_num, this.item_Attached_type, this.item_Attached_value);
-            for (let i = 0; i < this.item_Attached_num; i++) {
-                let Attached_value = this.item_Attached_value;
-                console.log("附加属性", this.item_Attached_type);
-                var self = this;
-                cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
-                    console.log(self.item_Attached_num + "词条数");
-                    console.log(cc.instantiate(prefab) + "预设");
-                    let _attached = cc.instantiate(prefab);
-                    cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
-                    _attached.children[0].getComponent(cc.Label).string = self.item_Attached_type + '+' + Attached_value;
-
-                });
-            }
-
-        }
-        if (this.item_Attached_type == 7) {
-            this.item_Attached_type = "闪避回蓝量";
-            this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value, this.item_Attached_num, this.item_Attached_type, this.item_Attached_value);
-            for (let i = 0; i < this.item_Attached_num; i++) {
-                let Attached_value = this.item_Attached_value;
-                console.log("附加属性", this.item_Attached_type);
-                var self = this;
-                cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
-                    console.log(self.item_Attached_num + "词条数");
-                    console.log(cc.instantiate(prefab) + "预设");
-                    let _attached = cc.instantiate(prefab);
-                    cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
-                    _attached.children[0].getComponent(cc.Label).string = self.item_Attached_type + '+' + Attached_value;
-
-                });
-            }
-
-        }
-        if (this.item_Attached_type == 8) {
-            this.item_Attached_type = "被动回蓝";
-            this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value, this.item_Attached_num, this.item_Attached_type, this.item_Attached_value);
-            for (let i = 0; i < this.item_Attached_num; i++) {
-                let Attached_value = this.item_Attached_value;
-                console.log("附加属性", this.item_Attached_type);
-                var self = this;
-                cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
-                    console.log(self.item_Attached_num + "词条数");
-                    console.log(cc.instantiate(prefab) + "预设");
-                    let _attached = cc.instantiate(prefab);
-                    cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
-                    _attached.children[0].getComponent(cc.Label).string = self.item_Attached_type + '+' + Attached_value;
-
-                });
-            }
-
-        }
-        if (this.item_Attached_type == 9) {
-            this.item_Attached_type = "被动回血";
-            this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value, this.item_Attached_num, this.item_Attached_type, this.item_Attached_value);
-            for (let i = 0; i < this.item_Attached_num; i++) {
-                let Attached_value = this.item_Attached_value;
-                console.log("附加属性", this.item_Attached_type);
-                var self = this;
-                cc.loader.loadRes("prefab/Items/ProBgAdd", (err, prefab) => {
-                    console.log(self.item_Attached_num + "词条数");
-                    console.log(cc.instantiate(prefab) + "预设");
-                    let _attached = cc.instantiate(prefab);
-                    cc.find("Canvas/PanelResult/interface_Box/GameBg/ProAdd").addChild(_attached);
-                    _attached.children[0].getComponent(cc.Label).string = self.item_Attached_type + '+' + Attached_value;
-
-                });
-            }
-
-        }
-
-
+        this.interfaceInfo.creatorItem(this.item_type, this.gradetype, this.item_master_type, this.item_master_value,
+            this.item_Attached_num, this.item_attached_nameArr, this.item_Attached_typeArr, this.item_attached_valueArr);
+        // }
     },
-
     // update (dt) {},
     init() {
         this.itemtorScrop = cc.find("Canvas/ItemController").getComponent("ItemController");
         this.interfaceInfo = cc.find("Canvas/Interface_Info").getComponent("Interface_Info"); //角色数据界面脚本
         this.UiController = cc.find("Canvas/UiController").getComponent('UiController');
-
     },
+    _prop_name(propnum) { //属性名字
+        if (propnum == 0) return "攻击";
+        if (propnum == 1) return "连击率";
+        if (propnum == 2) return "防御";
+        if (propnum == 3) return "血量";
+        if (propnum == 4) return "蓝量";
+        if (propnum == 5) return "格挡回血量";
+        if (propnum == 6) return "暴击率";
+        if (propnum == 7) return "闪避回蓝量";
+        if (propnum == 8) return "被动回蓝";
+        if (propnum == 9) return "被动回血";
+    },
+    gradetype_value(gradetype) {
+
+        if (gradetype == 0) {
+            return;
+        } else {
+            return this.random_num(1, gradetype);
+        }
+        // if (gradetype == 2) {
+        //     return this.random_num(1, 2);
+        // }
+        // if (gradetype == 3) {
+        //     return this.random_num(1, 3);
+        // }
+        // if (gradetype == 4) {
+        //     return this.random_num(1, 3);
+        // }
+    }
 });

assets/script/Game/Ui/UiController.js

@@ -57,6 +57,17 @@ cc.Class({
     start() {
         this.init();
         this.Role_Head_Event();
+        this.interface_info = cc.find("Canvas/Interface_Info").getComponent('Interface_Info');
+        let i = 5;
+        this.schedule(function() {
+            if (i == 0) return;
+            else {
+                i--;
+                this.interface_info.creatorgird();
+            }
+
+        }, 0.5);
+
 
     },
     Role_Head_Event() {