【修改】修改商城

assets/resources/edt_prefab/Shop/ShopItem.prefab

@@ -22,9 +22,13 @@
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 25
+      }
+    ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -48,8 +52,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -201,
-        -2,
+        0,
+        0,
         0,
         0,
         0,
@@ -101,10 +105,13 @@
     "_components": [
       {
         "__id__": 21
+      },
+      {
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -122,14 +129,14 @@
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 1
+      "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
         0,
-        175,
+        0,
         0,
         0,
         0,
@@ -184,7 +191,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 164,
+      "width": 167,
       "height": 68
     },
     "_anchorPoint": {
@@ -197,7 +204,7 @@
       "ctor": "Float64Array",
       "array": [
         -122.31,
-        -40.482,
+        121.246,
         0,
         0,
         0,
@@ -413,7 +420,7 @@
       "ctor": "Float64Array",
       "array": [
         -143.274,
-        -297.671,
+        -136.967,
         0,
         0,
         0,
@@ -520,7 +527,7 @@
       "ctor": "Float64Array",
       "array": [
         10.77,
-        -298.356,
+        -137.652,
         0,
         0,
         0,
@@ -629,7 +636,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -337.632,
+        -176.928,
         0,
         0,
         0,
@@ -738,7 +745,7 @@
       "ctor": "Float64Array",
       "array": [
         135.995,
-        -40.114,
+        120.59,
         0,
         0,
         0,
@@ -821,7 +828,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "0fd37f0e-be15-49c0-99e5-245518a30bf4"
+      "__uuid__": "d9e93c14-b1c5-4357-9c31-a8c57de9fd8a"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -838,6 +845,90 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 23
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": {
+      "__id__": 2
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "69095pa90NEa5NTEfWSjLCs",
+    "handler": "onClicked",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -849,6 +940,34 @@
     "sync": false
   },
   {
+    "__type__": "69095pa90NEa5NTEfWSjLCs",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "bg": {
+      "__id__": 21
+    },
+    "surfaceBg": {
+      "__id__": 7
+    },
+    "surface": {
+      "__id__": 5
+    },
+    "itemName": {
+      "__id__": 16
+    },
+    "cost": {
+      "__id__": 13
+    },
+    "selfButton": {
+      "__id__": 22
+    },
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/edt_prefab/Shop/ShopItemAlert.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.6",
+  "uuid": "7e848fb7-5342-48d4-a20d-04d998bfff5e",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/edt_prefab/Shop/ShopMain.prefab

@@ -269,7 +269,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 810,
-      "height": 961
+      "height": 861
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -358,7 +358,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -242.5,
+        -142.5,
         0,
         0,
         0,
@@ -1527,7 +1527,7 @@
     "_alignFlags": 41,
     "_left": 0,
     "_right": 0,
-    "_top": 100,
+    "_top": 0,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -1599,7 +1599,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -479.5,
+        -379.5,
         0,
         0,
         0,
@@ -2265,7 +2265,7 @@
       "__id__": 50
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 55
@@ -2452,7 +2452,7 @@
       "__id__": 45
     },
     "_enabled": true,
-    "allowSwitchOff": true,
+    "allowSwitchOff": false,
     "_id": ""
   },
   {
@@ -2849,7 +2849,7 @@
     "component": "",
     "_componentId": "ae0e6EA5rhN/IfKEQFEHpxI",
     "handler": "typeChooseToggleOnClicked",
-    "customEventData": "1"
+    "customEventData": "100"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3235,7 +3235,7 @@
     "component": "",
     "_componentId": "ae0e6EA5rhN/IfKEQFEHpxI",
     "handler": "typeChooseToggleOnClicked",
-    "customEventData": "2"
+    "customEventData": "200"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3621,7 +3621,7 @@
     "component": "",
     "_componentId": "ae0e6EA5rhN/IfKEQFEHpxI",
     "handler": "typeChooseToggleOnClicked",
-    "customEventData": "3"
+    "customEventData": "300"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4007,7 +4007,7 @@
     "component": "",
     "_componentId": "ae0e6EA5rhN/IfKEQFEHpxI",
     "handler": "typeChooseToggleOnClicked",
-    "customEventData": "4"
+    "customEventData": "400"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4393,7 +4393,7 @@
     "component": "",
     "_componentId": "ae0e6EA5rhN/IfKEQFEHpxI",
     "handler": "typeChooseToggleOnClicked",
-    "customEventData": "5"
+    "customEventData": "600"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4779,7 +4779,7 @@
     "component": "",
     "_componentId": "ae0e6EA5rhN/IfKEQFEHpxI",
     "handler": "typeChooseToggleOnClicked",
-    "customEventData": "6"
+    "customEventData": "700"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5165,7 +5165,7 @@
     "component": "",
     "_componentId": "ae0e6EA5rhN/IfKEQFEHpxI",
     "handler": "typeChooseToggleOnClicked",
-    "customEventData": "7"
+    "customEventData": "500"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5551,7 +5551,7 @@
     "component": "",
     "_componentId": "ae0e6EA5rhN/IfKEQFEHpxI",
     "handler": "typeChooseToggleOnClicked",
-    "customEventData": "8"
+    "customEventData": "99999"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5738,7 +5738,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -644,
+        -544,
         0,
         0,
         0,
@@ -7647,7 +7647,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -749,
+        -649,
         0,
         0,
         0,
@@ -7684,7 +7684,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "goodsView",
+    "_name": "shopView",
     "_objFlags": 0,
     "_parent": {
       "__id__": 4
@@ -7722,7 +7722,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -872.5,
+        -772.5,
         0,
         0,
         0,
@@ -7801,7 +7801,7 @@
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 810,
-      "height": 961
+      "height": 861
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -7814,7 +7814,7 @@
     "_N$startAxis": 0,
     "_N$paddingLeft": 0,
     "_N$paddingRight": 0,
-    "_N$paddingTop": 100,
+    "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
     "_N$spacingX": 0,
     "_N$spacingY": 0,
@@ -8088,6 +8088,15 @@
     "goldNumText": {
       "__id__": 29
     },
+    "shopView": {
+      "__id__": 200
+    },
+    "itemPrefab": {
+      "__uuid__": "78f4e0fb-a10a-4b65-8574-2d5ca9a94ffb"
+    },
+    "hotToggle": {
+      "__id__": 57
+    },
     "_id": ""
   },
   {

assets/resources/res_image/itemicon/box-djk01.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.4",
-  "uuid": "ad5bd4cb-0ba3-4229-880d-63cdd385b942",
+  "uuid": "9721ea21-46d3-4f35-be97-87562717ce18",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -13,8 +13,8 @@
   "subMetas": {
     "box-djk01": {
       "ver": "1.0.4",
-      "uuid": "472c1131-112b-4bb9-934e-80404cbd0a89",
-      "rawTextureUuid": "ad5bd4cb-0ba3-4229-880d-63cdd385b942",
+      "uuid": "d9e93c14-b1c5-4357-9c31-a8c57de9fd8a",
+      "rawTextureUuid": "9721ea21-46d3-4f35-be97-87562717ce18",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/resources/res_image/itemicon/box-djk02.png.meta

@@ -1,31 +1,31 @@
 {
   "ver": "2.3.4",
-  "uuid": "b338c127-caad-45b6-8c77-41e7faafdb6e",
+  "uuid": "12c5973d-c5d2-463d-8bab-f934a56e43ce",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 402,
-  "height": 322,
+  "width": 400,
+  "height": 320,
   "platformSettings": {},
   "subMetas": {
     "box-djk02": {
       "ver": "1.0.4",
-      "uuid": "cb82e61f-0ae7-49ed-982c-cd2a0a2d8424",
-      "rawTextureUuid": "b338c127-caad-45b6-8c77-41e7faafdb6e",
+      "uuid": "9175e5d9-4107-4c9b-b7b4-47011325bd72",
+      "rawTextureUuid": "12c5973d-c5d2-463d-8bab-f934a56e43ce",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0.5,
-      "trimX": 1,
-      "trimY": 1,
+      "trimX": 0,
+      "trimY": 0,
       "width": 400,
       "height": 319,
-      "rawWidth": 402,
-      "rawHeight": 322,
+      "rawWidth": 400,
+      "rawHeight": 320,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/res_image/itemicon/box-djk00.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.4",
-  "uuid": "38452b54-ff35-4199-a177-eb4297a20c7d",
+  "uuid": "87a7d873-e978-4127-9d45-ee5d32b00434",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -11,10 +11,10 @@
   "height": 322,
   "platformSettings": {},
   "subMetas": {
-    "box-djk00": {
+    "box-djk06": {
       "ver": "1.0.4",
-      "uuid": "0fd37f0e-be15-49c0-99e5-245518a30bf4",
-      "rawTextureUuid": "38452b54-ff35-4199-a177-eb4297a20c7d",
+      "uuid": "97a15320-24cb-4716-842a-4727cb1aac2c",
+      "rawTextureUuid": "87a7d873-e978-4127-9d45-ee5d32b00434",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/resources/res_image/itemicon/box-djk07.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "ace9f8ca-42b9-4079-a05d-b89d7ee69e79",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 402,
+  "height": 322,
+  "platformSettings": {},
+  "subMetas": {
+    "box-djk07": {
+      "ver": "1.0.4",
+      "uuid": "f1eb829d-5e44-407e-9400-1fd55baa5e91",
+      "rawTextureUuid": "ace9f8ca-42b9-4079-a05d-b89d7ee69e79",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0.5,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 400,
+      "height": 319,
+      "rawWidth": 402,
+      "rawHeight": 322,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/res_image/itemicon/other-tag01.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.4",
-  "uuid": "29f89797-e186-46fe-8fe0-4145e68f6763",
+  "uuid": "6bf00208-f71b-4ff7-965b-5ae112c60358",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -13,8 +13,8 @@
   "subMetas": {
     "other-tag01": {
       "ver": "1.0.4",
-      "uuid": "871f5d91-9530-4a1d-99aa-5b2b03dbf0d6",
-      "rawTextureUuid": "29f89797-e186-46fe-8fe0-4145e68f6763",
+      "uuid": "89c5efb0-9fc4-4397-a520-17a1e87d6f5a",
+      "rawTextureUuid": "6bf00208-f71b-4ff7-965b-5ae112c60358",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/resources/res_image/itemicon/other-tag02.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.4",
-  "uuid": "6bf00208-f71b-4ff7-965b-5ae112c60358",
+  "uuid": "3ace7804-dfd9-4f8c-bb7e-8154beaaa0af",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -13,8 +13,8 @@
   "subMetas": {
     "other-tag02": {
       "ver": "1.0.4",
-      "uuid": "89c5efb0-9fc4-4397-a520-17a1e87d6f5a",
-      "rawTextureUuid": "6bf00208-f71b-4ff7-965b-5ae112c60358",
+      "uuid": "224fed28-9a74-40f4-84f9-5446fa5e90b7",
+      "rawTextureUuid": "3ace7804-dfd9-4f8c-bb7e-8154beaaa0af",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/resources/res_json/GoodsConfig.json

@@ -172,43 +172,5 @@
     ],
     "rmb": 64800,
     "jfid": 10206
-  },
-  {
-    "id": 10301,
-    "name": "蝴蝶刀",
-    "aliasName": "蝴蝶刀",
-    "inShop": 1,
-    "items": [
-      {
-        "id": 10001,
-        "count": 1
-      }
-    ],
-    "price": [
-      {
-        "id": 102,
-        "count": 100
-      }
-    ],
-    "rmb": 100
-  },
-  {
-    "id": 10401,
-    "name": "M4A4",
-    "aliasName": "M4A4",
-    "inShop": 1,
-    "items": [
-      {
-        "id": 20001,
-        "count": 1
-      }
-    ],
-    "price": [
-      {
-        "id": 102,
-        "count": 100
-      }
-    ],
-    "rmb": 100
   }
 ]

assets/resources/res_json/ResItemConfig.json

@@ -36,6 +36,8 @@
     "modelType": 1,
     "surface": 1,
     "model": 112,
+    "inShop": 1,
+    "hot": 1,
     "enableComposite": false,
     "price": 135000,
     "priceConst": 85
@@ -48,6 +50,8 @@
     "modelType": 1,
     "surface": 2,
     "model": 112,
+    "inShop": 1,
+    "hot": 1,
     "enableComposite": false,
     "price": 145000,
     "priceConst": 85
@@ -60,6 +64,8 @@
     "modelType": 1,
     "surface": 3,
     "model": 112,
+    "inShop": 1,
+    "hot": 1,
     "enableComposite": false,
     "price": 155000,
     "priceConst": 85
@@ -72,6 +78,8 @@
     "modelType": 1,
     "surface": 4,
     "model": 112,
+    "inShop": 1,
+    "hot": 1,
     "enableComposite": false,
     "price": 165000,
     "priceConst": 85
@@ -84,6 +92,8 @@
     "modelType": 1,
     "surface": 5,
     "model": 112,
+    "inShop": 1,
+    "hot": 1,
     "enableComposite": false,
     "price": 175000,
     "priceConst": 85
@@ -96,6 +106,8 @@
     "modelType": 1,
     "surface": 6,
     "model": 112,
+    "inShop": 1,
+    "hot": 1,
     "enableComposite": false,
     "price": 185000,
     "priceConst": 85
@@ -108,6 +120,8 @@
     "modelType": 1,
     "surface": 1,
     "model": 118,
+    "inShop": 1,
+    "hot": 1,
     "enableComposite": false,
     "price": 185000,
     "priceConst": 85
@@ -120,6 +134,8 @@
     "modelType": 3,
     "surface": 3,
     "model": 406,
+    "inShop": 1,
+    "hot": 1,
     "enableComposite": false,
     "price": 205000,
     "priceConst": 85
@@ -132,6 +148,8 @@
     "modelType": 2,
     "surface": 2,
     "model": 702,
+    "inShop": 1,
+    "hot": 1,
     "enableComposite": false,
     "price": 195000,
     "priceConst": 85

assets/script/app/AppInit.js

@@ -54,5 +54,9 @@ module.exports = {
         // 支付数据管理器
         ns.PayMgr = require('PayMgr'); 
         ns.PayMgr.init();
+
+        // 商城数据管理器
+        ns.ShopMgr = require('ShopMgr'); 
+        ns.ShopMgr.init();
     }
 };

assets/script/app/config/ConfigBase.js

@@ -47,7 +47,10 @@ cc.Class({
         }
 
         // 缓存数据
-        this.indexsCache[data[this.mainKey]] = data;
+        if (data) {
+            this.indexsCache[data[this.mainKey]] = data;
+        }
+        
         return data;
     },
 

assets/script/app/constants/AppConstants.js

@@ -20,6 +20,7 @@ window.JMC.Proxy = cc.Enum({
 window.JMC.ALERT_ID = cc.Enum({
     DEFAULT: 0,                             // 默认
     DEBUG: 999,                             // 测试
+    SHOP_ITEM_ALERT: 1,                     // 商品兑换弹窗
 });
 
 // 物品类型枚举声明

assets/script/app/view/shop/ShopItem.js

@@ -0,0 +1,56 @@
+cc.Class({
+    extends: cc.Component,
+
+    editor: {
+        menu: 'Shop/ShopItem'
+    },
+
+    properties: {
+        bg: cc.Sprite,
+        surfaceBg: cc.Sprite,
+        surface: cc.Label,
+        itemName: cc.Label,
+        cost: cc.Label,
+        selfButton: cc.Button
+    },
+
+    reloadData (data) {
+        this._data = data;
+        this.initUI();
+    },
+
+    enabelClick (enable) {
+        this.selfButton.interactable = enable;
+    },
+
+    initUI () {
+        if (!this._data) return;
+
+        let quality = this._data.quality;
+        let path = cc.js.formatStr("res_image/itemicon/box-djk0%d", quality);
+        cc.loader.loadRes(path, cc.SpriteFrame, (error, spriteFrame) => {
+		    if (!error && cc.isValid(this.node, true)) {
+                this.bg.spriteFrame = spriteFrame;
+            }
+		});
+
+        let surface = this._data.surface;
+        let surfacepath =  cc.js.formatStr("res_image/itemicon/other-tag0%d", surface);
+        cc.loader.loadRes(surfacepath, cc.SpriteFrame, (error, spriteFrame) => {
+            if (!error && cc.isValid(this.node, true)) {
+                this.surfaceBg.spriteFrame = spriteFrame;
+            }
+        });
+
+        this.surface.string = this._data.surfaceStr;
+        this.cost.string = this._data.cost;
+        this.itemName.string = this._data.name;
+    },
+
+    onClicked () {
+        if (!this._data || !this._data.cb) return;
+
+        this._data.cb(this._data);
+    }
+
+});

assets/script/app/view/shop/ShopItem.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "69095a5a-f743-446b-9353-11f5928cb0ac",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/app/view/shop/ShopItemAlert.js

@@ -0,0 +1,41 @@
+const JMAlertBase = require('JMAlertBase');
+
+cc.Class({
+    extends: JMAlertBase,
+
+    editor: {
+        menu: 'Shop/ShopItemAlert'
+    },
+
+    properties: {
+        shopItemPrefab: cc.Prefab,
+        shopItemNode: cc.Node
+    },
+
+    reloadData(data) {
+        this._data = data;
+        this.initUI();
+    },
+
+    initUI () {
+        if (!this._data) return;
+
+        let itemNode = cc.instantiate(this.shopItemPrefab);
+        let shopItemCtr = itemNode.getComponent('ShopItem');
+        shopItemCtr.reloadData(this._data);
+        shopItemCtr.enabelClick(false);
+        this.shopItemNode.addChild(itemNode);
+    },
+
+    certainOnClicked () {
+        let goldNum = G.BagMgr.getItemNumById(JMC.ITEM_ID.GOLD);
+        if (goldNum < this._data.cost) {
+            G.AppUtils.getSceneCtrl().addToast('金币不足，分解饰品可获得');
+        }
+        else {
+            G.ShopMgr.requestShopBuyItem(this._data.config.id, 1);
+            this.close();
+        }
+    }
+
+});

assets/script/app/view/shop/ShopItemAlert.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "2e017624-cfc6-4a57-967e-8b8485c8d081",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/app/view/shop/ShopMain.js

@@ -19,6 +19,9 @@ cc.Class({
 
     properties: {
         goldNumText: cc.Label,
+        shopView: cc.Node,
+        itemPrefab: cc.Prefab,
+        hotToggle: cc.Toggle,
     },
 
     onLoad() {
@@ -28,30 +31,40 @@ cc.Class({
 
     initData() {
         this.goods = {};
-        let goodConfig = G.CfgMgr.goodsConfig.table;
-        for (let config of goodConfig) {
+        let itemConfig = G.CfgMgr.resItemConfig.table;
+        for (let config of itemConfig) {
             if (!config.inShop) {
                 continue;
             }
 
-            if (!config.items || config.items.length == 0) {
-                continue;
-            }
+            let itemname = config.name;
+            let cost = config.price ? config.price : 0;
 
-            let item = config.items[0];
-            let itemConfig = G.CfgMgr.resItemConfig.getByMainKey(item.id);
-
-            if (!itemConfig) {
-                continue;
+            let surface = config.surface;
+            let surfaceConfig = G.CfgMgr.resItemSurfaceConfig.getByMainKey(surface);
+            let surfaceStr = "";
+            if (surfaceConfig) {
+                surfaceStr = surfaceConfig.name;
             }
 
-            let name = itemConfig.name;
-            let cost = 0;
-            // if (config.price)
+            surface = surfaceStr == "" ? 0 : surface;
+            let quality = config.quality;
+            let model = config.model;
+
+            let itemData = {
+                name: itemname, 
+                cost: cost,
+                surface: surface,
+                surfaceStr: surfaceStr,
+                quality: quality,
+                model: model,
+                itemConfig: config,
+                cb: this.shopItemOnClicked
+            }
 
             let tagType = TagType.OTHER;
             for (var temp in TagType) {
-                if (TagType[temp] == itemConfig.type) {
+                if (TagType[temp] == config.type) {
                     tagType = TagType[temp];
                     break;
                 }
@@ -61,18 +74,47 @@ cc.Class({
                 this.goods[tagType] = [];
             }
 
-            this.goods[tagType].push(config);
+            this.goods[tagType].push(itemData);
+            if (config.hot) {
+                if (!this.goods[TagType.HOT]) {
+                    this.goods[TagType.HOT] = [];
+                }
+                this.goods[TagType.HOT].push(itemData);
+            }
         }
     },
 
     initUI() {
-        let goldNum = G.BagMgr.getItemNumById(JMC.ITEM_ID.SPECIAL_GOLD);
+        let goldNum = G.BagMgr.getItemNumById(JMC.ITEM_ID.GOLD);
+        this.goldNumText.string = goldNum;
+        this.hotToggle.isChecked = true;
+        this.showShopViewByTag(TagType.HOT);
+    },
+
+    showShopViewByTag(tag) {
+        let list = this.goods[tag];
+
+        this.shopView.removeAllChildren();
+        if (!list || list.length == 0) return;
 
+        for (let i = 0; i < list.length; i++) {
+            let data = list[i];
+            let itemNode = cc.instantiate(this.itemPrefab);
+            let shopItemCtr = itemNode.getComponent('ShopItem');
+            shopItemCtr.reloadData(data);
+            this.shopView.addChild(itemNode);
+        }
     },
 
     typeChooseToggleOnClicked(toggleData, eventKey) {
+        this.showShopViewByTag(eventKey);
+    },
 
+    shopItemOnClicked(data) {
+        G.AppUtils.getSceneCtrl().showAlert(
+            'edt_prefab/Shop/ShopItemAlert',
+            data
+        );
     }
 
-
 });

assets/script/core/model/shop.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "1677dce8-6134-4324-a141-fe471ea31ce3",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

assets/script/core/model/shop/ShopMgr.js

@@ -0,0 +1,66 @@
+/**
+ * 商城数据管理
+ */
+let ShopMgr = {
+
+    init() {
+        if (CC_EDITOR) {
+            return;
+        }
+
+        this._initEventListener();
+        this._initPublishListener();
+    },
+
+    _initEventListener() {
+        // 通用消息
+        G.PublicMgr.on(JMC.PUBLIC_MSG.SWITCH_ACCOUNT, JMC.PUBLIC_MSG_ORDER.BAG, this.handleDidSwitchAccount, this);
+        G.PublicMgr.on(JMC.PUBLIC_MSG.LOGIN_SUCCESS, JMC.PUBLIC_MSG_ORDER.BAG, this.handleDidLoginSuccess, this);
+        G.PublicMgr.on(JMC.PUBLIC_MSG.DISCONNECTED, JMC.PUBLIC_MSG_ORDER.BAG, this.handleDidDisconnected, this);
+    },
+
+    _initPublishListener() {
+        
+    },
+
+    handleDidLoginSuccess() {
+    },
+
+    handleDidDisconnected() {
+    },
+
+    handleDidSwitchAccount() {
+    },
+
+
+    //* ************* 客户端请求/响应 ************* *//
+
+    // # 购买道具
+    // shop_buy_item 2303 {
+    //     request {
+    //         id 0: integer                   # 道具ID
+    //         count 1: integer                # 购买数量,空则为1
+    //     }
+    //     response {
+    //         code 0: integer
+    //         items 1: *DataItem              # 发放物品
+    //     }
+    // }
+    requestShopBuyItem(itemId, count) {
+        let data = {
+            id: itemId,
+            count: count
+        }
+        G.NetworkMgr.sendSocketRequest('shop_buy_item', data, this._responseShopBuyItem.bind(this));
+    },
+
+    _responseShopBuyItem(data) {
+        let responseInfo = data.responseInfo;
+        if (responseInfo.code === 200) {
+            G.AppUtils.getSceneCtrl().addToast('兑换成功');
+        }
+    }
+}
+
+
+module.exports = ShopMgr;

assets/script/core/model/shop/ShopMgr.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "cb267c7c-a2f9-4162-b4f9-db03628c43bd",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}