商品页完成+ 英雄uuid 5000起步,技能6000起步,物品1000起步,金币9001

assets/resources/game/gui/MSCard.prefab

@@ -40,23 +40,23 @@
         "__id__": 90
       },
       {
-        "__id__": 143
+        "__id__": 145
       },
       {
-        "__id__": 179
+        "__id__": 181
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 215
+        "__id__": 217
       },
       {
-        "__id__": 217
+        "__id__": 219
       }
     ],
     "_prefab": {
-      "__id__": 219
+      "__id__": 221
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -362,10 +362,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
+    "_spriteFrame": null,
-      "__uuid__": "767c21dd-b2a2-4118-a12d-f67a8039abd4@f8120",
-      "__expectedType__": "cc.SpriteFrame"
-    },
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 0,
@@ -530,6 +527,8 @@
       "__id__": 0
     },
     "fileId": "1aPNLGgx5OPbr+WUXjBkEg",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -2018,11 +2017,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 140
+        "__id__": 142
       }
     ],
     "_prefab": {
-      "__id__": 142
+      "__id__": 144
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2944,6 +2943,9 @@
       },
       {
         "__id__": 139
+      },
+      {
+        "__id__": 140
       }
     ],
     "removedComponents": []
@@ -3025,6 +3027,22 @@
       "z": 1
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 141
+    },
+    "propertyPath": [
+      "_spriteFrame"
+    ],
+    "value": null
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "edi51irzpKDKLz+RbshuSX"
+    ]
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -3035,7 +3053,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 141
+      "__id__": 143
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3076,32 +3094,32 @@
     },
     "_children": [
       {
-        "__id__": 144
+        "__id__": 146
       },
       {
-        "__id__": 150
+        "__id__": 152
       },
       {
-        "__id__": 156
+        "__id__": 158
       },
       {
-        "__id__": 162
+        "__id__": 164
       },
       {
-        "__id__": 168
+        "__id__": 170
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 174
+        "__id__": 176
       },
       {
-        "__id__": 176
+        "__id__": 178
       }
     ],
     "_prefab": {
-      "__id__": 178
+      "__id__": 180
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3138,20 +3156,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 143
+      "__id__": 145
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 145
+        "__id__": 147
       },
       {
-        "__id__": 147
+        "__id__": 149
       }
     ],
     "_prefab": {
-      "__id__": 149
+      "__id__": 151
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3188,11 +3206,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 144
+      "__id__": 146
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 146
+      "__id__": 148
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3216,11 +3234,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 144
+      "__id__": 146
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 148
+      "__id__": 150
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3274,20 +3292,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 143
+      "__id__": 145
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 151
+        "__id__": 153
       },
       {
-        "__id__": 153
+        "__id__": 155
       }
     ],
     "_prefab": {
-      "__id__": 155
+      "__id__": 157
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3324,11 +3342,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 150
+      "__id__": 152
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 152
+      "__id__": 154
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3352,11 +3370,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 150
+      "__id__": 152
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 154
+      "__id__": 156
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3410,20 +3428,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 143
+      "__id__": 145
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 157
+        "__id__": 159
       },
       {
-        "__id__": 159
+        "__id__": 161
       }
     ],
     "_prefab": {
-      "__id__": 161
+      "__id__": 163
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3460,11 +3478,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 156
+      "__id__": 158
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 158
+      "__id__": 160
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3488,11 +3506,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 156
+      "__id__": 158
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 160
+      "__id__": 162
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3546,20 +3564,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 143
+      "__id__": 145
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 163
+        "__id__": 165
       },
       {
-        "__id__": 165
+        "__id__": 167
       }
     ],
     "_prefab": {
-      "__id__": 167
+      "__id__": 169
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3596,11 +3614,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 162
+      "__id__": 164
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 164
+      "__id__": 166
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3624,11 +3642,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 162
+      "__id__": 164
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 166
+      "__id__": 168
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3682,20 +3700,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 143
+      "__id__": 145
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 169
+        "__id__": 171
       },
       {
-        "__id__": 171
+        "__id__": 173
       }
     ],
     "_prefab": {
-      "__id__": 173
+      "__id__": 175
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3732,11 +3750,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 168
+      "__id__": 170
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 170
+      "__id__": 172
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3760,11 +3778,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 168
+      "__id__": 170
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 172
+      "__id__": 174
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3818,11 +3836,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 143
+      "__id__": 145
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 175
+      "__id__": 177
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3846,11 +3864,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 143
+      "__id__": 145
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 177
+      "__id__": 179
     },
     "_resizeMode": 2,
     "_layoutType": 3,
@@ -3901,32 +3919,32 @@
     },
     "_children": [
       {
-        "__id__": 180
+        "__id__": 182
       },
       {
-        "__id__": 186
+        "__id__": 188
       },
       {
-        "__id__": 192
+        "__id__": 194
       },
       {
-        "__id__": 198
+        "__id__": 200
       },
       {
-        "__id__": 204
+        "__id__": 206
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 210
+        "__id__": 212
       },
       {
-        "__id__": 212
+        "__id__": 214
       }
     ],
     "_prefab": {
-      "__id__": 214
+      "__id__": 216
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3963,20 +3981,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 179
+      "__id__": 181
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 181
+        "__id__": 183
       },
       {
-        "__id__": 183
+        "__id__": 185
       }
     ],
     "_prefab": {
-      "__id__": 185
+      "__id__": 187
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4013,11 +4031,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 180
+      "__id__": 182
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 182
+      "__id__": 184
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4041,11 +4059,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 180
+      "__id__": 182
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 184
+      "__id__": 186
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4099,20 +4117,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 179
+      "__id__": 181
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 187
+        "__id__": 189
       },
       {
-        "__id__": 189
+        "__id__": 191
       }
     ],
     "_prefab": {
-      "__id__": 191
+      "__id__": 193
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4149,11 +4167,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 186
+      "__id__": 188
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 188
+      "__id__": 190
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4177,11 +4195,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 186
+      "__id__": 188
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 190
+      "__id__": 192
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4235,20 +4253,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 179
+      "__id__": 181
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 193
+        "__id__": 195
       },
       {
-        "__id__": 195
+        "__id__": 197
       }
     ],
     "_prefab": {
-      "__id__": 197
+      "__id__": 199
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4285,11 +4303,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 192
+      "__id__": 194
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 194
+      "__id__": 196
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4313,11 +4331,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 192
+      "__id__": 194
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 196
+      "__id__": 198
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4371,20 +4389,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 179
+      "__id__": 181
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 199
+        "__id__": 201
       },
       {
-        "__id__": 201
+        "__id__": 203
       }
     ],
     "_prefab": {
-      "__id__": 203
+      "__id__": 205
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4421,11 +4439,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 198
+      "__id__": 200
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 200
+      "__id__": 202
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4449,11 +4467,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 198
+      "__id__": 200
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 202
+      "__id__": 204
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4507,20 +4525,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 179
+      "__id__": 181
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 205
+        "__id__": 207
       },
       {
-        "__id__": 207
+        "__id__": 209
       }
     ],
     "_prefab": {
-      "__id__": 209
+      "__id__": 211
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4557,11 +4575,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 204
+      "__id__": 206
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 206
+      "__id__": 208
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4585,11 +4603,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 204
+      "__id__": 206
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 208
+      "__id__": 210
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4643,11 +4661,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 179
+      "__id__": 181
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 211
+      "__id__": 213
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4671,11 +4689,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 179
+      "__id__": 181
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 213
+      "__id__": 215
     },
     "_resizeMode": 2,
     "_layoutType": 3,
@@ -4726,7 +4744,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 216
+      "__id__": 218
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4754,7 +4772,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 218
+      "__id__": 220
     },
     "_id": ""
   },

assets/resources/game/gui/item.prefab

@@ -229,7 +229,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 9
@@ -365,7 +365,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 15
@@ -501,7 +501,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 21
@@ -637,7 +637,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 27

assets/resources/game/gui/schip.prefab

@@ -437,10 +437,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
+    "_spriteFrame": null,
-      "__uuid__": "767c21dd-b2a2-4118-a12d-f67a8039abd4@fa39c",
-      "__expectedType__": "cc.SpriteFrame"
-    },
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 0,

assets/resources/game/skills/skill_icon.plist

@@ -4,7 +4,7 @@
     <dict>
         <key>frames</key>
         <dict>
-            <key>1001.png</key>
+            <key>6001.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -19,7 +19,7 @@
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>1002.png</key>
+            <key>6002.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -30,11 +30,11 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{115,1},{112,116}}</string>
+                <string>{{1,119},{112,116}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>1003.png</key>
+            <key>6003.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -45,26 +45,26 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{229,1},{112,116}}</string>
+                <string>{{1,237},{112,116}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>2001.png</key>
+            <key>6004.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
-                <string>{-2,-1}</string>
+                <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{112,116}</string>
+                <string>{90,90}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{343,1},{112,116}}</string>
+                <string>{{1,827},{90,90}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>2002.png</key>
+            <key>6005.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -75,11 +75,11 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{457,1},{112,116}}</string>
+                <string>{{1,355},{112,116}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>2003.png</key>
+            <key>6101.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -90,11 +90,11 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{571,1},{112,116}}</string>
+                <string>{{1,473},{112,116}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>9001.png</key>
+            <key>6102.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -105,11 +105,11 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{685,1},{112,116}}</string>
+                <string>{{1,591},{112,116}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>9002.png</key>
+            <key>6103.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -120,7 +120,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{799,1},{112,116}}</string>
+                <string>{{1,709},{112,116}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -136,9 +136,9 @@
             <key>realTextureFileName</key>
             <string>skill_icon.png</string>
             <key>size</key>
-            <string>{912,118}</string>
+            <string>{114,918}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:2d32c7d66c9c9b68838afcae4ad4bf4a:19972fb1e384d5d15aeca6fcbe488df0:fc419542501e310cbb024c3f9a203681$</string>
+            <string>$TexturePacker:SmartUpdate:4420425d89904e0a5a7102c8e25c1362:4d8fa8a0ad7db56018372d9e3f232e07:fc419542501e310cbb024c3f9a203681$</string>
             <key>textureFileName</key>
             <string>skill_icon.png</string>
         </dict>

assets/resources/game/skills/skill_icon.plist.meta

@@ -7,58 +7,12 @@
     ".json"
   ],
   "subMetas": {
-    "49343": {
+    "ec0a2": {
       "importer": "sprite-frame",
-      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@49343",
+      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@ec0a2",
       "displayName": "",
-      "id": "49343",
+      "id": "ec0a2",
-      "name": "2002",
+      "name": "6001",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": -2,
-        "offsetY": -1,
-        "trimX": 457,
-        "trimY": 1,
-        "width": 112,
-        "height": 116,
-        "rawWidth": 128,
-        "rawHeight": 128,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "697e2bd1-01c2-4282-94c2-e8cf6370ca7d@6c48a",
-        "atlasUuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "b3f5a": {
-      "importer": "sprite-frame",
-      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@b3f5a",
-      "displayName": "",
-      "id": "b3f5a",
-      "name": "1001",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
@@ -99,20 +53,20 @@
       ],
       "subMetas": {}
     },
-    "f8120": {
+    "48ded": {
       "importer": "sprite-frame",
-      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@f8120",
+      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@48ded",
       "displayName": "",
-      "id": "f8120",
+      "id": "48ded",
-      "name": "1002",
+      "name": "6002",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": -2,
         "offsetY": -1,
-        "trimX": 115,
+        "trimX": 1,
-        "trimY": 1,
+        "trimY": 119,
         "width": 112,
         "height": 116,
         "rawWidth": 128,
@@ -145,20 +99,20 @@
       ],
       "subMetas": {}
     },
-    "a59f6": {
+    "71e54": {
       "importer": "sprite-frame",
-      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@a59f6",
+      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@71e54",
       "displayName": "",
-      "id": "a59f6",
+      "id": "71e54",
-      "name": "1003",
+      "name": "6003",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": -2,
         "offsetY": -1,
-        "trimX": 229,
+        "trimX": 1,
-        "trimY": 1,
+        "trimY": 237,
         "width": 112,
         "height": 116,
         "rawWidth": 128,
@@ -191,20 +145,66 @@
       ],
       "subMetas": {}
     },
-    "d37cb": {
+    "64ed2": {
       "importer": "sprite-frame",
-      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@d37cb",
+      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@64ed2",
       "displayName": "",
-      "id": "d37cb",
+      "id": "64ed2",
-      "name": "2001",
+      "name": "6004",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 1,
+        "trimY": 827,
+        "width": 90,
+        "height": 90,
+        "rawWidth": 90,
+        "rawHeight": 90,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [],
+          "indexes": [],
+          "uv": [],
+          "nuv": [],
+          "minPos": [],
+          "maxPos": []
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "697e2bd1-01c2-4282-94c2-e8cf6370ca7d@6c48a",
+        "atlasUuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "54f93": {
+      "importer": "sprite-frame",
+      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@54f93",
+      "displayName": "",
+      "id": "54f93",
+      "name": "6005",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": -2,
         "offsetY": -1,
-        "trimX": 343,
+        "trimX": 1,
-        "trimY": 1,
+        "trimY": 355,
         "width": 112,
         "height": 116,
         "rawWidth": 128,
@@ -237,20 +237,20 @@
       ],
       "subMetas": {}
     },
-    "a4b0e": {
+    "2a96a": {
       "importer": "sprite-frame",
-      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@a4b0e",
+      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@2a96a",
       "displayName": "",
-      "id": "a4b0e",
+      "id": "2a96a",
-      "name": "2003",
+      "name": "6101",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": -2,
         "offsetY": -1,
-        "trimX": 571,
+        "trimX": 1,
-        "trimY": 1,
+        "trimY": 473,
         "width": 112,
         "height": 116,
         "rawWidth": 128,
@@ -283,20 +283,20 @@
       ],
       "subMetas": {}
     },
-    "c8366": {
+    "7615a": {
       "importer": "sprite-frame",
-      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@c8366",
+      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@7615a",
       "displayName": "",
-      "id": "c8366",
+      "id": "7615a",
-      "name": "9001",
+      "name": "6102",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": -2,
         "offsetY": -1,
-        "trimX": 685,
+        "trimX": 1,
-        "trimY": 1,
+        "trimY": 591,
         "width": 112,
         "height": 116,
         "rawWidth": 128,
@@ -329,20 +329,20 @@
       ],
       "subMetas": {}
     },
-    "fa39c": {
+    "53c0f": {
       "importer": "sprite-frame",
-      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@fa39c",
+      "uuid": "767c21dd-b2a2-4118-a12d-f67a8039abd4@53c0f",
       "displayName": "",
-      "id": "fa39c",
+      "id": "53c0f",
-      "name": "9002",
+      "name": "6103",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": -2,
         "offsetY": -1,
-        "trimX": 799,
+        "trimX": 1,
-        "trimY": 1,
+        "trimY": 709,
         "width": 112,
         "height": 116,
         "rawWidth": 128,

assets/resources/gui/element/item_info.prefab

@@ -1649,10 +1649,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
+    "_spriteFrame": null,
-      "__uuid__": "767c21dd-b2a2-4118-a12d-f67a8039abd4@fa39c",
-      "__expectedType__": "cc.SpriteFrame"
-    },
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 0,

assets/script/game/common/SingletonModuleComp.ts

@@ -30,32 +30,35 @@ export class SingletonModuleComp extends ecs.Comp {
         is_battle:false,
         lv:1,
         victory:0,
-        mskill:1001,
+        mskill:6001,
-        mmskill:1002,
+        mmskill:6002,
         
     };
     skills: any = {
-        1001:{uuid:1001,slv:0,num:4,x1:1,x10:0},
+        6001:{uuid:6001,slv:0,num:4,x1:1,x10:0},
-        1002:{uuid:1002,slv:0,num:3,x1:2,x10:0},
+        6002:{uuid:6002,slv:0,num:3,x1:2,x10:0},
-        1003:{uuid:1003,slv:0,num:0,x1:0,x10:0},
+        6003:{uuid:6003,slv:0,num:0,x1:0,x10:0},
-        1004:{uuid:1004,slv:0,num:0,x1:0,x10:0},
+        6004:{uuid:6004,slv:0,num:0,x1:0,x10:0},
-        1005:{uuid:1005,slv:0,num:0,x1:0,x10:0},
+        6005:{uuid:6005,slv:0,num:0,x1:0,x10:0},
-        1006:{uuid:1006,slv:0,num:0,x1:0,x10:0},
+        6006:{uuid:6006,slv:0,num:0,x1:0,x10:0},
-        1007:{uuid:1007,slv:0,num:0,x1:0,x10:0},
+        6007:{uuid:6007,slv:0,num:0,x1:0,x10:0},
-        1008:{uuid:1008,slv:0,num:0,x1:0,x10:0},
+        6008:{uuid:6008,slv:0,num:0,x1:0,x10:0},
-        1009:{uuid:1009,slv:0,num:0,x1:0,x10:0},
+        6012:{uuid:6012,slv:0,num:0,x1:0,x10:0},
     };
     /** 游戏主角 */
     heros:any={
-        9001:{uuid:9001,lv:1,exp:0,slv:0,stone:0,num:100,x1:1,x10:0},
+        5001:{uuid:5001,lv:1,exp:0,slv:1,stone:0,num:100,x1:1,x10:0},
-        9002:{uuid:9002,lv:2,exp:0,slv:1,stone:0,num:80,x1:2,x10:0},
+        5002:{uuid:5002,lv:2,exp:0,slv:1,stone:0,num:80,x1:2,x10:0},
-        9003:{uuid:9003,lv:3,exp:0,slv:2,stone:0,num:90,x1:3,x10:0},
+        5003:{uuid:5003,lv:3,exp:0,slv:1,stone:0,num:90,x1:3,x10:0},
-        9004:{uuid:9004,lv:1,exp:0,slv:0,stone:0,num:100,x1:1,x10:0},
+        5004:{uuid:5004,lv:1,exp:0,slv:0,stone:0,num:100,x1:1,x10:0},
-        9005:{uuid:9005,lv:2,exp:0,slv:1,stone:0,num:80,x1:2,x10:0},
+        5005:{uuid:5005,lv:2,exp:0,slv:0,stone:0,num:80,x1:2,x10:0},
-        9006:{uuid:9006,lv:3,exp:0,slv:2,stone:0,num:90,x1:3,x10:0},
+        5006:{uuid:5006,lv:3,exp:0,slv:0,stone:0,num:90,x1:3,x10:0},
     };
     goods:any=[ 
-        {uuid:9001,num:100000,type:0,cost:0,inventory:99}, 
+        {uuid:9001,num:100000,type:0,cost:0,inventory:5},         
+        {uuid:9003,num:1000,type:1,cost:0,inventory:5},       
+        {uuid:1001,num:10,type:2,cost:10000,inventory:99}, 
+        {uuid:5001,num:10,type:3,cost:10000,inventory:99}, 
     ];
     items:any={
         1001:{uuid:1001,num:10,x1:1,x10:0},
@@ -75,7 +78,7 @@ export class SingletonModuleComp extends ecs.Comp {
         1015:{uuid:1015,num:1000,x1:0,x10:0},
         1016:{uuid:1016,num:1000,x1:0,x10:0},
     };
-    fight_heros=[9003,9002]
+    fight_heros=[5001,5002]
     mheros:any = [];
     monsters:any = [];
     sk_info:any = []

assets/script/game/common/config/MissionSet.ts

@@ -1,7 +1,7 @@
 
 export const MonsetList = {
     1:{
-        1:[9001],
+        1:[5001],
     }
     
 }
@@ -13,9 +13,9 @@ export const BossList = {
 }
 export const MissionNum = 3 //对应关卡数MissionSet 的索引
 export const MissionSet = [
-        [9001],
+        [5001],
-        [9001],
+        [5001],
-        [9001],
+        [5001],
 ]
 
 

assets/script/game/common/config/SkillSet.ts

@@ -28,45 +28,28 @@ run:number = 0; // 0有目标 带方向，1贝塞尔曲线 2 不动 ,3 直线
 
 */
 export const SkillSet={
-     1001:{uuid: 1001,path: "1001",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 1,name: "火球术",sp_name:"fire",info:"释放一个火球术攻击敌人",
+     6001:{uuid: 6001,path: "6001",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 1,name: "火球术",sp_name:"fire",info:"释放一个火球术攻击敌人",
-          dis:1,count:1,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:3,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },
+          dis:1,count:1,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:3,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:600, },
-     1002:{uuid: 1002,path: "1002",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 3,name: "寒冰箭",sp_name:"ice",info:"释放一个寒冰箭攻击敌人",
+     6002:{uuid: 6002,path: "6002",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 3,name: "寒冰箭",sp_name:"ice",info:"释放一个寒冰箭攻击敌人",
-          dis:1,count:1,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },   
+          dis:1,count:1,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:600, },   
-     1003:{uuid: 1003,path: "1003",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 3,name: "强效射击",sp_name:"b_arrow",info:"释放一个火球术攻击敌人",
+     6003:{uuid: 6003,path: "6003",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 3,name: "强效射击",sp_name:"b_arrow",info:"释放一个火球术攻击敌人",
-          dis:1,count:1,in:0,run:1,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },
+          dis:1,count:1,in:0,run:1,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:600, },
-     1004:{uuid: 1004,path: "1004",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 3,name: "奥术冲击",sp_name:"bm_ball",info:"释放一个寒冰箭攻击敌人",
+     6004:{uuid: 6004,path: "6004",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 3,name: "奥术冲击",sp_name:"bm_ball",info:"释放一个寒冰箭攻击敌人",
-          dis:1,count:1,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },
+          dis:1,count:1,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:600, },
+     6005:{uuid: 6005,path: "6005",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 1,name: "挥砍",sp_name:"patk",info:"蓄力释放剑气攻击敌人",
+          dis:1,count:1,in:0,run:0,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:6000,},
 
-     2001:{uuid: 2001,path: "2001",type: 91,tg:1,angle:false,exp:30,upcost:2,level: 1,name: "治愈术",sp_name:"heath",info:"释放一个寒冰箭攻击敌人",
+     6101:{uuid: 6101,path: "6101",type: 91,tg:1,angle:false,exp:30,upcost:2,level: 1,name: "治愈术",sp_name:"heath",info:"释放一个寒冰箭攻击敌人",
-          dis:1,count:1,in:0,run:1,ap:0,hp:3,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:450, },
+          dis:1,count:1,in:0,run:1,ap:0,hp:3,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:450, },
-     2002:{uuid: 2002,path: "2002",type: 91,tg:0,angle:false,exp:30,upcost:2,level: 1,name: "魔法盾",sp_name:"shield",info:"释放一个寒冰箭攻击敌人",
+     6102:{uuid: 6102,path: "6102",type: 91,tg:0,angle:false,exp:30,upcost:2,level: 1,name: "魔法盾",sp_name:"shield",info:"释放一个寒冰箭攻击敌人",
-          dis:1,count:1,in:0.2,run:2,ap:0,hp:0,shield:1,sd:0,cd:0,bsd:8,bcd:0,sk_uuid:1001,sk_count:0,speed:450, },
+          dis:1,count:1,in:0.2,run:2,ap:0,hp:0,shield:1,sd:0,cd:0,bsd:8,bcd:0,sk_uuid:6001,sk_count:0,speed:450, },
-     2003:{uuid: 2003,path: "2003",type: 91,tg:0,angle:false,exp:30,upcost:2,level: 1,name: "狂暴",sp_name:"atkup",info:"释放一个寒冰箭攻击敌人",
+     6103:{uuid: 6103,path: "6103",type: 91,tg:0,angle:false,exp:30,upcost:2,level: 1,name: "狂暴",sp_name:"atkup",info:"释放一个寒冰箭攻击敌人",
-          dis:1,count:1,in:0.2,run:2,ap:1,hp:0,shield:0,sd:0,cd:0,bsd:8,bcd:0,sk_uuid:1001,sk_count:0,speed:450, },
+          dis:1,count:1,in:0.2,run:2,ap:1,hp:0,shield:0,sd:0,cd:0,bsd:8,bcd:0,sk_uuid:6001,sk_count:0,speed:450, },
         
 
-     3001:{uuid: 3001,path: "3001",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 1,name: "三连击",sp_name:"patk",info:"释放一个魔法球攻击敌人",
-          dis:1,count:3,in:0.3,run:2,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600,}, 
-
-     4011:{uuid: 4011,path: "1011",type: 11,tg:3,angle:true,exp:30,upcost:2,level: 3,name: "火焰风暴",sp_name:"fire",info:"释放多个个火球术攻击敌人",
-          dis:1,count:5,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:2,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },
-     4012:{uuid: 4012,path: "1012",type: 11,tg:3,angle:true,exp:30,upcost:2,level: 3,name: "冰晶风暴",sp_name:"ice",info:"释放多个个寒冰箭攻击敌人",
-          dis:1,count:5,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:2,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },
-
-     9001:{uuid: 9001,path: "1001",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 1,name: "普攻",sp_name:"patk",info:"释放一个魔法球攻击敌人",
-          dis:1,count:1,in:0,run:0,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:1000,},
-     9002:{uuid: 9002,path: "1001",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 1,name: "魔法小球",sp_name:"mball",info:"释放一个魔法球攻击敌人",
-          dis:1,count:1,in:0,run:0,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600,},
-     9003:{uuid: 9003,path: "1001",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 1,name: "射击",sp_name:"arrow",info:"释放一个魔法球攻击敌人",
-          dis:1,count:1,in:0,run:1,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600,},
-
-          
-     8001:{uuid: 8001,path: "8001",type: 1,tg:3,angle:true,exp:30,upcost:2,level: 1,name: "飞刀",sp_name:"sword1",info:"释放一个魔法球攻击敌人",
-          dis:1,count:1,in:0,run:0,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:8001,sk_count:0,speed:600,},
-
 }
 
-export const MSklist = [1001,1002]
+export const MSklist = [6001,6002]
 export const MSkillset={
      confirmexp:10,
 }

assets/script/game/common/config/heroSet.ts

@@ -44,54 +44,54 @@ import { Talents } from "./TalentSet"
  * crc 暴击触发sk3需要次数	
 **/
 export const HeroInfo = {
-   9001: {
+   5001: {
-      uuid:9001,name: "圣盾骑士",path:"k1",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:5001,name: "圣盾骑士",path:"k1",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
-      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:10,uapw:10,cpw:10,dpw:10,dopw:10,
+      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:10,uapw:10,cpw:10,dpw:10,dopw:10,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
-   9002: {
+   5002: {
-      uuid:9002,name: "狂暴骑士",path:"k2",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:5002,name: "狂暴骑士",path:"k2",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
-      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
+      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
-   9003: {
+   5003: {
-      uuid:9003,name: "防御骑士",path:"k3",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:5003,name: "防御骑士",path:"k3",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
-      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
+      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
-   9004: {
+   5004: {
-      uuid:9003,name: "111",path:"a1",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:5004,name: "111",path:"a1",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
-      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
+      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
-   9005: {
+   5005: {
-      uuid:9003,name: "222",path:"a2",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:5005,name: "222",path:"a2",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
-      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
+      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
-   9006: {
+   5006: {
-      uuid:9003,name: "333",path:"a3",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:5006,name: "333",path:"a3",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
-      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
+      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
 
 }
-export const HeroList = [9001,9002,9003,9004,9005,9006]
+export const HeroList = [5001,5002,5003,5004,5005,5006]
 export const MonSet = {
-   5001: {
+   5201: {
-      uuid: 5001, path: "boss1", type: 1, level: 1,cost:2, name: "骷髅王", atk: 30, hp: 150, atk_dis: 200, a_cd: 2, power: 0, power_max: 10, speed: 7,
+      uuid: 5201, path: "boss1", type: 1, level: 1,cost:2, name: "骷髅王", atk: 30, hp: 150, atk_dis: 200, a_cd: 2, power: 0, power_max: 10, speed: 7,
       max_skill: "精准打击", skill_uuid: 1001, max_skill_uuid: 1002,   atktype: 1
    },
 }

assets/script/game/hero/HChipComp.ts

@@ -25,6 +25,7 @@ export class HChipComp extends Component {
     update_data(uuid:number,num:number=0){
         this.h_uuid = uuid;
         var icon_path = "game/heros/herois"
+        console.log("HeroInfo[uuid]",HeroInfo[uuid],uuid)
         resources.load(icon_path, SpriteAtlas, (err: any, atlas) => {
             const sprite = this.node.getChildByName("hero").getChildByName("icon").getComponent(Sprite);
             sprite.spriteFrame = atlas.getSpriteFrame(HeroInfo[uuid].path);

assets/script/game/map/GoodsComp.ts

@@ -27,13 +27,13 @@ export class GoodsComp extends CCComp {
         let goods:any=smc.goods[this.smc_index]
         let gnode=this.node.getChildByName("item")
         switch (goods.type) {
-            case 0:
+            default:
                 let item=ecs.getEntity<Item>(Item)
                 item.load(goods.uuid,goods.num,gnode)
                 this.node.getChildByName("inventory").getComponent(Label).string="库存:"+goods.inventory.toString()
                 console.log("item",item)
                 break;
-            case 1:
+            case 3:
                 let path =  "game/gui/hchip";
                 let prefab: Prefab = oops.res.get(path, Prefab)!;
                 let node = instantiate(prefab);
@@ -51,7 +51,34 @@ export class GoodsComp extends CCComp {
     }
     buy(){
         console.log("购买商品"+this.smc_index)
+        let goods:any=smc.goods[this.smc_index]
+        if(smc.vmdata.gold.num <= goods.cost){
+            oops.gui.toast("金币不足");
+            return
         }
+        if(goods.inventory <= 0){
+            oops.gui.toast("库存不足");
+            return
+        }
+        switch (goods.type) {
+            case 0:
+                smc.vmdata.gold.num+=goods.num
+                break;
+            case 1:
+                smc.vmdata.exp.num+=goods.num
+                break;
+            case 2:
+                smc.items[goods.uuid].num+=goods.num
+                break;
+            case 3:
+                smc.heros[goods.uuid].num += goods.num
+                break;
+        }
+        goods.inventory--
+        smc.vmdata.gold.num-=goods.cost
+        this.update_inventory()
+    }
+   
     update_inventory(){
         this.node.getChildByName("inventory").getComponent(Label).string="库存:"+smc.goods[this.smc_index].inventory
     }

assets/script/game/map/HeroHomeComp.ts

@@ -25,7 +25,7 @@ export class HeroHomeComp extends CCComp {
     start() {
         // this.load_talents()
         console.log("hero_home start")
-        this.h_uuid=9001
+        this.h_uuid=5001
         this.hero_show(this.h_uuid)
         this.loads()
     }
@@ -44,6 +44,7 @@ export class HeroHomeComp extends CCComp {
         this.h_uuid=uuid
         this.role=smc.heros[uuid]
         this.hero=HeroInfo[uuid]
+        console.log("hero_show",uuid)
         let tal=this.node.getChildByName("sk").getChildByName("tal");
         let sk_node= this.node.getChildByName("sk");
         let skill1 = SkillSet[this.hero.sk1[0]]

assets/script/game/map/MSkillComp.ts

@@ -18,7 +18,6 @@ export class MSkillComp extends CCComp {
     cd:number = 0;
     /** 视图层逻辑代码分离演示 */
     start() {
-        console.log("MSkillComp start s_uuid:",this.s_uuid,this.group);
     }
     init(){
         this.lv=0

assets/script/game/map/MissionHomeComp.ts

@@ -91,7 +91,6 @@ export class MissionHomeComp extends CCComp {
         for(let i=0;i<loaded.length;i++){
             if(smc.heros[loaded[i].HeroSelectComp.h_uuid].slv ==0 ) {
                 loaded[i].HeroSelectComp.node.active=false
-                console.log("loaded[i].HeroSelectComp",loaded[i].HeroSelectComp)
             }else{
                 loaded[i].HeroSelectComp.node.active=true
             }
@@ -138,13 +137,13 @@ export class MissionHomeComp extends CCComp {
         }
     }
     call_hero(h_uuid:number,index:number){
+        console.log("call hero",h_uuid,HeroInfo[h_uuid])
         var path =  "game/heros/uiheros/"+HeroInfo[h_uuid].path;
         var prefab: Prefab = oops.res.get(path, Prefab)!;
         var node = instantiate(prefab);
         var scene = smc.map.MapView.scene;
         node.parent = scene.entityLayer!.node!
         node.setPosition(this.heros_pos[index].px,BoxSet.GAME_LINE,0);
-        console.log("this.heros_pos[index].px",this.heros_pos[index].px)
         let comp = node.getComponent(UiHeroComp)
         comp.h_uuid = h_uuid
         this.heros.push(comp)