浏览代码

【修改】修改商城

DESKTOP-VHLO35R\Administrator 1 年之前
父节点
当前提交
e49962d3d4

文件差异内容过多而无法显示
+ 155 - 1007
assets/resources/edt_prefab/Shop/ShopMain.prefab


+ 47 - 0
assets/resources/res_json/GoodsConfig.json

@@ -3,6 +3,7 @@
3 3
     "id": 10101,
4 4
     "name": "1000金币",
5 5
     "aliasName": "1000金币",
6
+    "inShop": 0,
6 7
     "items": [
7 8
       {
8 9
         "id": 101,
@@ -20,6 +21,7 @@
20 21
     "id": 10102,
21 22
     "name": "10000金币",
22 23
     "aliasName": "10000金币",
24
+    "inShop": 0,
23 25
     "items": [
24 26
       {
25 27
         "id": 101,
@@ -37,6 +39,7 @@
37 39
     "id": 10103,
38 40
     "name": "100000金币",
39 41
     "aliasName": "100000金币",
42
+    "inShop": 0,
40 43
     "items": [
41 44
       {
42 45
         "id": 101,
@@ -54,6 +57,7 @@
54 57
     "id": 10201,
55 58
     "name": "60绑金",
56 59
     "aliasName": "60绑金",
60
+    "inShop": 0,
57 61
     "items": [
58 62
       {
59 63
         "id": 102,
@@ -73,6 +77,7 @@
73 77
     "id": 10202,
74 78
     "name": "300绑金",
75 79
     "aliasName": "300绑金",
80
+    "inShop": 0,
76 81
     "items": [
77 82
       {
78 83
         "id": 102,
@@ -92,6 +97,7 @@
92 97
     "id": 10203,
93 98
     "name": "680绑金",
94 99
     "aliasName": "680绑金",
100
+    "inShop": 0,
95 101
     "items": [
96 102
       {
97 103
         "id": 102,
@@ -111,6 +117,7 @@
111 117
     "id": 10204,
112 118
     "name": "1280绑金",
113 119
     "aliasName": "1280绑金",
120
+    "inShop": 0,
114 121
     "items": [
115 122
       {
116 123
         "id": 102,
@@ -130,6 +137,7 @@
130 137
     "id": 10205,
131 138
     "name": "3280绑金",
132 139
     "aliasName": "3280绑金",
140
+    "inShop": 0,
133 141
     "items": [
134 142
       {
135 143
         "id": 102,
@@ -149,6 +157,7 @@
149 157
     "id": 10206,
150 158
     "name": "6480绑金",
151 159
     "aliasName": "6480绑金",
160
+    "inShop": 0,
152 161
     "items": [
153 162
       {
154 163
         "id": 102,
@@ -163,5 +172,43 @@
163 172
     ],
164 173
     "rmb": 64800,
165 174
     "jfid": 10206
175
+  },
176
+  {
177
+    "id": 10301,
178
+    "name": "蝴蝶刀",
179
+    "aliasName": "蝴蝶刀",
180
+    "inShop": 1,
181
+    "items": [
182
+      {
183
+        "id": 10001,
184
+        "count": 1
185
+      }
186
+    ],
187
+    "price": [
188
+      {
189
+        "id": 102,
190
+        "count": 100
191
+      }
192
+    ],
193
+    "rmb": 100
194
+  },
195
+  {
196
+    "id": 10401,
197
+    "name": "M4A4",
198
+    "aliasName": "M4A4",
199
+    "inShop": 1,
200
+    "items": [
201
+      {
202
+        "id": 20001,
203
+        "count": 1
204
+      }
205
+    ],
206
+    "price": [
207
+      {
208
+        "id": 102,
209
+        "count": 100
210
+      }
211
+    ],
212
+    "rmb": 100
166 213
   }
167 214
 ]

+ 10 - 1
assets/script/app/constants/AppConstants.js

@@ -24,7 +24,16 @@ window.JMC.ALERT_ID = cc.Enum({
24 24
 
25 25
 // 物品类型枚举声明
26 26
 window.JMC.ITEM_TYPE = cc.Enum({
27
-    
27
+    GOLD: 1,                   // 金豆
28
+    SPECIAL_GOLD: 2,           // 绑金
29
+    EXCHANGE_GOLD: 3,          // 兑换币
30
+    KINIFE: 100,               // 匕首
31
+    HANDGUN: 200,              // 手枪
32
+    SHOTGUN: 300,              // 散弹枪
33
+    RIFLE: 400,                // 步枪
34
+    PRINTING: 500,             // 印花
35
+    LSTA: 600,                 // 轻机枪
36
+    GLOVE: 700,                // 手套
28 37
 });
29 38
 
30 39
 // 物品 Id 枚举声明

+ 10 - 0
assets/script/app/model/utils/ItemDataUtils.js

@@ -0,0 +1,10 @@
1
+let ItemDataUtils = {
2
+    /**
3
+     * 物品配置
4
+     */
5
+    getConfig (itemId) {
6
+        return G.CfgMgr.ResItemConfig.getByMainKey(itemId);
7
+    },
8
+}
9
+
10
+module.exports = ItemDataUtils;

+ 33 - 2
assets/script/app/view/shop/ShopMain.js

@@ -1,3 +1,15 @@
1
+const TagType = {
2
+    OTHER: -1,
3
+    HOT: 0,
4
+    KINIFE: 100,               // 匕首
5
+    HANDGUN: 200,              // 手枪
6
+    SHOTGUN: 300,              // 散弹枪
7
+    RIFLE: 400,                // 步枪
8
+    PRINTING: 500,             // 印花
9
+    LSTA: 600,                 // 轻机枪
10
+    GLOVE: 700,                // 手套
11
+};
12
+
1 13
 cc.Class({
2 14
     extends: cc.Component,
3 15
 
@@ -13,12 +25,31 @@ cc.Class({
13 25
         this.initUI();
14 26
     },
15 27
 
28
+    initData () {
29
+        this.goods = {};
30
+        let goodConfig = G.CfgMgr.GoodsConfig.table;
31
+        for (let config of goodConfig) {
32
+            if (!config.inShop) {
33
+                continue;
34
+            }
35
+
36
+            if (!config.items || config.items.length == 0) {
37
+                continue;
38
+            }
39
+
40
+            let item = config.items[0];
41
+            
42
+        } 
43
+    },
44
+
16 45
     initUI() {
17 46
         let goldNum = G.BagMgr.getItemNumById(JMC.ITEM_ID.SPECIAL_GOLD);
18
-
47
+        
19 48
     },
20 49
 
21 50
     typeChooseToggleOnClicked(toggleData, eventKey) {
22
-        G.LogUtils.log('###########', eventKey);
51
+        
23 52
     }
53
+
54
+
24 55
 });

+ 3 - 3
assets/script/core/debug/DebuguAlert.js

@@ -32,12 +32,12 @@ cc.Class({
32 32
     },
33 33
     
34 34
     debuguItemAddOnClicked() {
35
-        if (this.itemIdEB.String.length == 0) {
35
+        if (this.itemIdEB.string.length == 0) {
36 36
             return;
37 37
         }
38 38
 
39
-        let itemid = parseInt(this.itemIdEB.String);
40
-        let num = this.itemNumEB.String.length == 0 ? 1 : parseInt(this.itemNumEB.String);
39
+        let itemid = parseInt(this.itemIdEB.string);
40
+        let num = this.itemNumEB.string.length == 0 ? 1 : parseInt(this.itemNumEB.string);
41 41
 
42 42
         this.requestAddItems([
43 43
             {