Просмотр исходного кода

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

lzx 1 неделя назад
Родитель
Сommit
79aacd3988

+ 50 - 38
Assets/Res/Config/LanguageChineseConfig.json

@@ -7598,7 +7598,7 @@
     },
     {
       "ID": 1900,
-      "txt": "GM商店"
+      "txt": "GM资源"
     },
     {
       "ID": 1901,
@@ -7614,11 +7614,11 @@
     },
     {
       "ID": 1904,
-      "txt": "法宝商店"
+      "txt": "GM法宝"
     },
     {
       "ID": 1905,
-      "txt": "功法商店"
+      "txt": "GM功法"
     },
     {
       "ID": 1906,
@@ -7786,11 +7786,11 @@
     },
     {
       "ID": 1947,
-      "txt": "好感度礼物1"
+      "txt": "清茶"
     },
     {
       "ID": 1948,
-      "txt": "好感度礼物2"
+      "txt": "茉莉花茶"
     },
     {
       "ID": 1949,
@@ -7802,7 +7802,7 @@
     },
     {
       "ID": 1951,
-      "txt": "心情礼物"
+      "txt": "妃子笑"
     },
     {
       "ID": 1952,
@@ -12774,107 +12774,107 @@
     },
     {
       "ID": 3194,
-      "txt": "神识符-金币"
+      "txt": "灵石神识符"
     },
     {
       "ID": 3195,
-      "txt": "神识符-修为"
+      "txt": "修为神识符"
     },
     {
       "ID": 3196,
-      "txt": "神识符-功法灵气"
+      "txt": "灵气神识符"
     },
     {
       "ID": 3197,
-      "txt": "神识符-法宝灵韵"
+      "txt": "玄晶神识符"
     },
     {
       "ID": 3198,
-      "txt": "神识符-功法碎片"
+      "txt": "功法神识符"
     },
     {
       "ID": 3199,
-      "txt": "神识符-法宝碎片"
+      "txt": "法宝神识符"
     },
     {
       "ID": 3200,
-      "txt": "神识符-修为丹"
+      "txt": "修为神识符"
     },
     {
       "ID": 3201,
-      "txt": "神识符-天材地宝"
+      "txt": "天地神识符"
     },
     {
       "ID": 3202,
-      "txt": "神识符-渡劫丹"
+      "txt": "渡劫神识符"
     },
     {
       "ID": 3203,
-      "txt": "神识符-好感度礼物"
+      "txt": "好感神识符"
     },
     {
       "ID": 3204,
-      "txt": "神识符-心情礼物"
+      "txt": "心情神识符"
     },
     {
       "ID": 3205,
-      "txt": "紫色神识提升符"
+      "txt": "紫色神识符"
     },
     {
       "ID": 3206,
-      "txt": "橙色神识提升符"
+      "txt": "橙色神识符"
     },
     {
       "ID": 3207,
-      "txt": "使用后必定出现产出金币的神识事件。"
+      "txt": "探索神识时,指定获得大量灵石作为奖励。"
     },
     {
       "ID": 3208,
-      "txt": "使用后必定出现产出修为的神识事件。"
+      "txt": "探索神识时,指定获得大量修为作为奖励。"
     },
     {
       "ID": 3209,
-      "txt": "使用后必定出现产出功法灵气的神识事件。"
+      "txt": "探索神识时,指定获得大量灵气作为奖励。"
     },
     {
       "ID": 3210,
-      "txt": "使用后必定出现产出法宝灵韵的神识事件。"
+      "txt": "探索神识时,指定获得大量玄晶作为奖励。"
     },
     {
       "ID": 3211,
-      "txt": "使用后必定出现产出功法碎片的神识事件。"
+      "txt": "探索神识时,指定获得大量功法碎片作为奖励。"
     },
     {
       "ID": 3212,
-      "txt": "使用后必定出现产出法宝碎片的神识事件。"
+      "txt": "探索神识时,指定获得大量法宝碎片作为奖励。"
     },
     {
       "ID": 3213,
-      "txt": "使用后必定出现产出修为丹的神识事件。"
+      "txt": "探索神识时,指定获得大量修为作为奖励。"
     },
     {
       "ID": 3214,
-      "txt": "使用后必定出现产出天材地宝的神识事件。"
+      "txt": "探索神识时,指定获得大量天材地宝作为奖励。"
     },
     {
       "ID": 3215,
-      "txt": "使用后必定出现产出渡劫丹的神识事件。"
+      "txt": "探索神识时,指定获得大量渡劫丹作为奖励。"
     },
     {
       "ID": 3216,
-      "txt": "使用后必定出现产出好感度礼物的神识事件。"
+      "txt": "探索神识时,指定获得大量好感度礼物作为奖励。"
     },
     {
       "ID": 3217,
-      "txt": "使用后必定出现产出心情礼物的神识事件。"
+      "txt": "探索神识时,指定获得大量心情礼物作为奖励。"
     },
     {
       "ID": 3218,
-      "txt": "使用后大幅提升紫色神识事件出现的概率。"
+      "txt": "探索神识时,必定探得紫色品质神识。"
     },
     {
       "ID": 3219,
-      "txt": "使用后大幅提升橙色神识事件出现的概率。"
+      "txt": "探索神识时,必定探得橙色品质神识。"
     },
     {
       "ID": 3220,
@@ -38418,27 +38418,27 @@
     },
     {
       "ID": 10345,
-      "txt": "0.7"
+      "txt": "70%"
     },
     {
       "ID": 10346,
-      "txt": "0.19"
+      "txt": "19%"
     },
     {
       "ID": 10347,
-      "txt": "0.06"
+      "txt": "6%"
     },
     {
       "ID": 10348,
-      "txt": "0.03"
+      "txt": "3%"
     },
     {
       "ID": 10349,
-      "txt": "0.015"
+      "txt": "1.5%"
     },
     {
       "ID": 10350,
-      "txt": "0.005"
+      "txt": "0.5%"
     },
     {
       "ID": 10351,
@@ -38499,6 +38499,18 @@
     {
       "ID": 10365,
       "txt": "第{0}层"
+    },
+    {
+      "ID": 10366,
+      "txt": "已达最大购买次数"
+    },
+    {
+      "ID": 10367,
+      "txt": "用途"
+    },
+    {
+      "ID": 10368,
+      "txt": "购买"
     }
   ]
 }

+ 2 - 2
Assets/Res/Config/ShopGroupConfig.json

@@ -13,7 +13,7 @@
       "ID": 2,
       "shopName": 1904,
       "pageSortNum": 97,
-      "isShow": false,
+      "isShow": true,
       "titleShowItemIds": [
         1001
       ]
@@ -22,7 +22,7 @@
       "ID": 3,
       "shopName": 1905,
       "pageSortNum": 98,
-      "isShow": false,
+      "isShow": true,
       "titleShowItemIds": [
         1001
       ]

+ 25 - 25
Assets/Res/Config/ShopItemConfig.json

@@ -145,7 +145,7 @@
         1301
       ],
       "itemCount": [
-        999
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -165,10 +165,10 @@
       "ID": 8,
       "giftID": "",
       "itemId": [
-        1302
+        1701
       ],
       "itemCount": [
-        999
+        99
       ],
       "costItemId": 1001,
       "price": 1,
@@ -188,10 +188,10 @@
       "ID": 9,
       "giftID": "",
       "itemId": [
-        1303
+        1702
       ],
       "itemCount": [
-        999
+        99
       ],
       "costItemId": 1001,
       "price": 1,
@@ -211,10 +211,10 @@
       "ID": 10,
       "giftID": "",
       "itemId": [
-        1304
+        1703
       ],
       "itemCount": [
-        999
+        99
       ],
       "costItemId": 1001,
       "price": 1,
@@ -349,7 +349,7 @@
       "ID": 16,
       "giftID": "",
       "itemId": [
-        21002
+        1501
       ],
       "itemCount": [
         99
@@ -464,7 +464,7 @@
       "ID": 21,
       "giftID": "",
       "itemId": [
-        21007
+        1401
       ],
       "itemCount": [
         99
@@ -487,7 +487,7 @@
       "ID": 22,
       "giftID": "",
       "itemId": [
-        21008
+        1402
       ],
       "itemCount": [
         99
@@ -510,7 +510,7 @@
       "ID": 23,
       "giftID": "",
       "itemId": [
-        21009
+        1403
       ],
       "itemCount": [
         99
@@ -533,7 +533,7 @@
       "ID": 24,
       "giftID": "",
       "itemId": [
-        21010
+        1404
       ],
       "itemCount": [
         99
@@ -556,7 +556,7 @@
       "ID": 25,
       "giftID": "",
       "itemId": [
-        21011
+        1601
       ],
       "itemCount": [
         99
@@ -1645,8 +1645,8 @@
       "costItemId": 9999,
       "price": 6,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,
@@ -1668,8 +1668,8 @@
       "costItemId": 9999,
       "price": 6,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,
@@ -1691,8 +1691,8 @@
       "costItemId": 9999,
       "price": 6,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,
@@ -1714,8 +1714,8 @@
       "costItemId": 9999,
       "price": 12,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,
@@ -1737,8 +1737,8 @@
       "costItemId": 9999,
       "price": 12,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,
@@ -1760,8 +1760,8 @@
       "costItemId": 9999,
       "price": 30,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,

BIN
Excel2Json/Excel/Item.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/Shop.xlsx