From 3967a950c1909be8cf7cb68a4a136f53ae853f80 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 3 Aug 2023 16:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E9=98=9F=E9=9C=80=E6=B1=82=E6=94=B9?=
=?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_accumulate.json | 227 +++++++++++++
bin/json/game_activereward.json | 31 +-
bin/json/game_battleready.json | 4 +-
bin/json/game_buriedcondi.json | 54 ++-
bin/json/game_caravancity.json | 10 +-
bin/json/game_caravanreward.json | 2 +-
bin/json/game_caravanthing.json | 20 ++
bin/json/game_guidance.json | 39 ++-
bin/json/game_item.json | 88 ++++-
bin/json/game_lottery.json | 240 +++++++++++++
bin/json/game_paypackage.json | 227 +++++--------
bin/json/game_recharge.json | 91 +++++
bin/json/game_shopcentercontrol.json | 26 +-
bin/json/game_shopcenterfund.json | 22 +-
bin/json/game_shopcentersubmeter.json | 72 ++--
bin/json/game_stonebuff.json | 320 +++++++++---------
bin/json/game_taskactivereward.json | 31 +-
bin/json/game_taskround.json | 18 +
modules/caravan/comp_configure.go | 7 +-
modules/caravan/model_caravan.go | 2 +
modules/caravan/module.go | 113 ++++---
pb/caravan_db.pb.go | 90 ++---
sys/configure/structs/Game.Accumulate.go | 42 +++
sys/configure/structs/Game.AccumulateData.go | 50 +++
sys/configure/structs/Game.BuffType.go | 1 +
.../structs/Game.CaravanThingData.go | 2 +
sys/configure/structs/Game.FightEventType.go | 3 +
sys/configure/structs/Game.GuidanceData.go | 2 +
sys/configure/structs/Tables.go | 7 +
sys/configure/structs/game.taskRoundData.go | 2 +
30 files changed, 1283 insertions(+), 560 deletions(-)
create mode 100644 bin/json/game_accumulate.json
create mode 100644 sys/configure/structs/Game.Accumulate.go
create mode 100644 sys/configure/structs/Game.AccumulateData.go
diff --git a/bin/json/game_accumulate.json b/bin/json/game_accumulate.json
new file mode 100644
index 000000000..7365d538b
--- /dev/null
+++ b/bin/json/game_accumulate.json
@@ -0,0 +1,227 @@
+[
+ {
+ "integral": 1000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100000
+ }
+ ]
+ },
+ {
+ "integral": 2000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200000
+ }
+ ]
+ },
+ {
+ "integral": 3000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300000
+ }
+ ]
+ },
+ {
+ "integral": 4000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 400000
+ }
+ ]
+ },
+ {
+ "integral": 5000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 500000
+ }
+ ]
+ },
+ {
+ "integral": 6000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 600000
+ }
+ ]
+ },
+ {
+ "integral": 7000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 700000
+ }
+ ]
+ },
+ {
+ "integral": 8000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 800000
+ }
+ ]
+ },
+ {
+ "integral": 9000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 900000
+ }
+ ]
+ },
+ {
+ "integral": 10000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000000
+ }
+ ]
+ },
+ {
+ "integral": 11000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1100000
+ }
+ ]
+ },
+ {
+ "integral": 12000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1200000
+ }
+ ]
+ },
+ {
+ "integral": 13000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1300000
+ }
+ ]
+ },
+ {
+ "integral": 14000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1400000
+ }
+ ]
+ },
+ {
+ "integral": 15000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1500000
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_activereward.json b/bin/json/game_activereward.json
index 49f6a4c3d..932e88a92 100644
--- a/bin/json/game_activereward.json
+++ b/bin/json/game_activereward.json
@@ -8,16 +8,6 @@
"a": "attr",
"t": "diamond",
"n": 150
- },
- {
- "a": "item",
- "t": "17010000",
- "n": 50
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 1000000
}
],
"action": "main_weektask_action_1_act",
@@ -33,15 +23,10 @@
"t": "diamond",
"n": 150
},
- {
- "a": "item",
- "t": "17010000",
- "n": 100
- },
{
"a": "attr",
"t": "gold",
- "n": 1000000
+ "n": 500000
}
],
"action": "main_weektask_action_1_act",
@@ -57,15 +42,10 @@
"t": "diamond",
"n": 150
},
- {
- "a": "item",
- "t": "17010000",
- "n": 100
- },
{
"a": "attr",
"t": "gold",
- "n": 1000000
+ "n": 600000
}
],
"action": "main_weektask_action_1_act",
@@ -81,15 +61,10 @@
"t": "diamond",
"n": 150
},
- {
- "a": "item",
- "t": "17010000",
- "n": 100
- },
{
"a": "attr",
"t": "gold",
- "n": 1000000
+ "n": 600000
}
],
"action": "main_weektask_action_1_act",
diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index 3e53d732a..bffecd295 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -391,7 +391,7 @@
"battleScenes": [
"scenesfight_07"
],
- "HideAlienSpace": 0,
+ "HideAlienSpace": 1,
"ShowBuff": 0,
"battleEvents": [],
"ScoreGroupID": 0,
@@ -439,7 +439,7 @@
"battleScenes": [
"scenesfight_05_01"
],
- "HideAlienSpace": 0,
+ "HideAlienSpace": 1,
"ShowBuff": 0,
"battleEvents": [],
"ScoreGroupID": 0,
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 7d02f119f..6f75a26f2 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -25552,7 +25552,7 @@
"filter2": []
},
{
- "id": 50000039,
+ "id": 50000038,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25574,7 +25574,7 @@
"filter2": []
},
{
- "id": 50000040,
+ "id": 50000039,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25598,7 +25598,7 @@
"filter2": []
},
{
- "id": 50000041,
+ "id": 50000040,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25622,7 +25622,7 @@
"filter2": []
},
{
- "id": 50000042,
+ "id": 50000041,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25646,7 +25646,7 @@
"filter2": []
},
{
- "id": 50000043,
+ "id": 50000042,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25670,7 +25670,7 @@
"filter2": []
},
{
- "id": 50000044,
+ "id": 50000043,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25694,7 +25694,7 @@
"filter2": []
},
{
- "id": 50000045,
+ "id": 50000044,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25718,7 +25718,7 @@
"filter2": []
},
{
- "id": 50000046,
+ "id": 50000045,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25742,7 +25742,7 @@
"filter2": []
},
{
- "id": 50000047,
+ "id": 50000046,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25766,7 +25766,7 @@
"filter2": []
},
{
- "id": 50000048,
+ "id": 50000047,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25790,7 +25790,7 @@
"filter2": []
},
{
- "id": 50000049,
+ "id": 50000048,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25814,7 +25814,7 @@
"filter2": []
},
{
- "id": 50000050,
+ "id": 50000049,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25838,7 +25838,7 @@
"filter2": []
},
{
- "id": 50000051,
+ "id": 50000050,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25862,7 +25862,7 @@
"filter2": []
},
{
- "id": 50000052,
+ "id": 50000051,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25886,7 +25886,7 @@
"filter2": []
},
{
- "id": 50000053,
+ "id": 50000052,
"rtype": 2,
"ctype": 3,
"notify": [],
@@ -25908,5 +25908,29 @@
12870
],
"filter2": []
+ },
+ {
+ "id": 50000053,
+ "rtype": 2,
+ "ctype": 3,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_921",
+ "text": "找对象聊天15"
+ },
+ "type": 20001,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 60431,
+ "value": 1,
+ "filter": [
+ 12870
+ ],
+ "filter2": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_caravancity.json b/bin/json/game_caravancity.json
index a0f3d0613..7e48ee691 100644
--- a/bin/json/game_caravancity.json
+++ b/bin/json/game_caravancity.json
@@ -61,7 +61,7 @@
3000
],
"Orspecial": 1000,
- "checktime": 1800,
+ "checktime": 1,
"extalk": 11001,
"ortalk": 11002,
"sptalk": 11003,
@@ -132,7 +132,7 @@
3001
],
"Orspecial": 1000,
- "checktime": 1800,
+ "checktime": 1,
"extalk": 11001,
"ortalk": 11002,
"sptalk": 11003,
@@ -204,7 +204,7 @@
3002
],
"Orspecial": 1000,
- "checktime": 1800,
+ "checktime": 1,
"extalk": 11001,
"ortalk": 11002,
"sptalk": 11003,
@@ -276,7 +276,7 @@
3003
],
"Orspecial": 1000,
- "checktime": 1800,
+ "checktime": 1,
"extalk": 11001,
"ortalk": 11002,
"sptalk": 11003,
@@ -347,7 +347,7 @@
3004
],
"Orspecial": 1000,
- "checktime": 1800,
+ "checktime": 1,
"extalk": 11001,
"ortalk": 11002,
"sptalk": 11003,
diff --git a/bin/json/game_caravanreward.json b/bin/json/game_caravanreward.json
index 1336106d4..1d5d0f050 100644
--- a/bin/json/game_caravanreward.json
+++ b/bin/json/game_caravanreward.json
@@ -56,7 +56,7 @@
},
{
"id": 6,
- "key": 0,
+ "key": -10,
"reward": [
{
"a": "attr",
diff --git a/bin/json/game_caravanthing.json b/bin/json/game_caravanthing.json
index 0fd6c6473..c8de86435 100644
--- a/bin/json/game_caravanthing.json
+++ b/bin/json/game_caravanthing.json
@@ -6,6 +6,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -36,6 +37,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -66,6 +68,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -96,6 +99,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -126,6 +130,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -156,6 +161,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -186,6 +192,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -216,6 +223,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -246,6 +254,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -276,6 +285,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -306,6 +316,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -336,6 +347,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -366,6 +378,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -396,6 +409,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -426,6 +440,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -456,6 +471,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -486,6 +502,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -516,6 +533,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -546,6 +564,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
@@ -576,6 +595,7 @@
5,
15
],
+ "changetime": 600,
"PriceChangeWeight": [
40,
20,
diff --git a/bin/json/game_guidance.json b/bin/json/game_guidance.json
index 58c569e2f..e40139df4 100644
--- a/bin/json/game_guidance.json
+++ b/bin/json/game_guidance.json
@@ -7,7 +7,8 @@
"intr": {
"key": "guidance_1",
"text": "今日剩余任务：{0}/{1}"
- }
+ },
+ "opencondid": "rdtask"
},
{
"id": 2,
@@ -17,7 +18,8 @@
"intr": {
"key": "guidance_2",
"text": "今日完成进度：{0}/{1}"
- }
+ },
+ "opencondid": "daily_practice"
},
{
"id": 3,
@@ -27,7 +29,8 @@
"intr": {
"key": "guidance_3",
"text": "今日完成进度：{0}/{1}"
- }
+ },
+ "opencondid": "puzzle"
},
{
"id": 4,
@@ -37,7 +40,8 @@
"intr": {
"key": "guidance_4",
"text": "今日剩余车票：{0}"
- }
+ },
+ "opencondid": "caravan"
},
{
"id": 5,
@@ -47,7 +51,8 @@
"intr": {
"key": "guidance_5",
"text": "今日剩余签到：{0}"
- }
+ },
+ "opencondid": "guild"
},
{
"id": 6,
@@ -57,7 +62,8 @@
"intr": {
"key": "guidance_6",
"text": "今日剩余挑战次数：{0}"
- }
+ },
+ "opencondid": "guild"
},
{
"id": 7,
@@ -67,7 +73,8 @@
"intr": {
"key": "guidance_7",
"text": "今日剩余任务：{0}"
- }
+ },
+ "opencondid": "guild"
},
{
"id": 8,
@@ -77,7 +84,8 @@
"intr": {
"key": "guidance_8",
"text": "今日剩余挑战券：{0}"
- }
+ },
+ "opencondid": "arena"
},
{
"id": 9,
@@ -87,7 +95,8 @@
"intr": {
"key": "guidance_9",
"text": "今日剩余训练次数：{0}"
- }
+ },
+ "opencondid": "kungfu"
},
{
"id": 10,
@@ -97,7 +106,8 @@
"intr": {
"key": "guidance_10",
"text": "今日剩余可挑战关卡：{0}"
- }
+ },
+ "opencondid": "kungfu"
},
{
"id": 11,
@@ -107,7 +117,8 @@
"intr": {
"key": "guidance_11",
"text": "今日剩余体力：{0}/{1}"
- }
+ },
+ "opencondid": "vikingexpedition_entrance"
},
{
"id": 12,
@@ -117,7 +128,8 @@
"intr": {
"key": "guidance_12",
"text": "今日剩余体力：{0}/{1}"
- }
+ },
+ "opencondid": "hunting"
},
{
"id": 13,
@@ -127,6 +139,7 @@
"intr": {
"key": "guidance_13",
"text": "今日剩余体力：{0}/{1}"
- }
+ },
+ "opencondid": "vikingexpedition_experience"
}
]
\ No newline at end of file
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 9676f498e..68aaf3dec 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -761,7 +761,7 @@
],
"use_skip": 107,
"upper_limit": 999,
- "img": "wp_icon_10023",
+ "img": "wp_icon_10024",
"intr": {
"key": "item_item_intr_17",
"text": "蕴含着光耀力量的神石，用于阵营招募抽取守护者"
@@ -933,7 +933,7 @@
],
"use_skip": 107,
"upper_limit": 999,
- "img": "wp_icon_10023",
+ "img": "wp_icon_10024",
"intr": {
"key": "item_item_intr_21",
"text": "蕴含着光耀力量的神石的碎片，消耗10个可用于阵营招募抽取守护者"
@@ -976,7 +976,7 @@
],
"use_skip": 107,
"upper_limit": 999,
- "img": "wp_icon_10019",
+ "img": "wp_icon_10023",
"intr": {
"key": "item_item_intr_22",
"text": "蕴含神秘力量的石头，消耗100个可以在许愿招募池内兑换英雄"
@@ -16392,5 +16392,87 @@
"n": 1000
}
]
+ },
+ {
+ "id": "10000039",
+ "name": {
+ "key": "item_item_name_374",
+ "text": "石阵秘境宝箱钥匙"
+ },
+ "usetype": 1,
+ "color": 4,
+ "bagtype": 0,
+ "index": 1,
+ "special_type": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 11001,
+ "upper_limit": 999,
+ "img": "item_10000035",
+ "intr": {
+ "key": "item_item_intr_380",
+ "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。"
+ },
+ "describe": {
+ "key": "item_item_describe_380",
+ "text": "此处是包装描述"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ]
+ },
+ {
+ "id": "17110001",
+ "name": {
+ "key": "item_item_name_374",
+ "text": "3种族招募卡自选箱"
+ },
+ "usetype": 4,
+ "color": 5,
+ "bagtype": 2,
+ "index": 1,
+ "special_type": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 0,
+ "upper_limit": 999,
+ "img": "",
+ "intr": {
+ "key": "item_item_intr_383",
+ "text": "可以从中自由选择3种阵营招募卷的宝箱"
+ },
+ "describe": {
+ "key": "item_item_describe_383",
+ "text": ""
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json
index ddad5bf11..7bb9487d7 100644
--- a/bin/json/game_lottery.json
+++ b/bin/json/game_lottery.json
@@ -23950,5 +23950,245 @@
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
+ },
+ {
+ "id": 999,
+ "lotteryid": 22001001,
+ "description": "冒险基金简单奖励",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 220001,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1
+ },
+ "itemdes": "冒险基金简单奖励",
+ "itemwt": 1000,
+ "min": 200,
+ "max": 200,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 1000,
+ "lotteryid": 22001001,
+ "description": "冒险基金简单奖励",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 220001,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ },
+ "itemdes": "冒险基金简单奖励",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 1001,
+ "lotteryid": 22001002,
+ "description": "冒险基金普通奖励",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 220002,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1
+ },
+ "itemdes": "冒险基金普通奖励",
+ "itemwt": 1000,
+ "min": 400,
+ "max": 400,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 1002,
+ "lotteryid": 22001002,
+ "description": "冒险基金普通奖励",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 220002,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "10000009",
+ "n": 1
+ },
+ "itemdes": "冒险基金普通奖励",
+ "itemwt": 1000,
+ "min": 20,
+ "max": 20,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 1003,
+ "lotteryid": 22001003,
+ "description": "冒险基金困难奖励",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 220002,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1
+ },
+ "itemdes": "冒险基金困难奖励",
+ "itemwt": 1000,
+ "min": 800,
+ "max": 800,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 1004,
+ "lotteryid": 22001003,
+ "description": "冒险基金困难奖励",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 220003,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "17060007",
+ "n": 1
+ },
+ "itemdes": "冒险基金困难奖励",
+ "itemwt": 1000,
+ "min": 20,
+ "max": 20,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 1005,
+ "lotteryid": 22002001,
+ "description": "等级基金第一次奖励",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 220021,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "itemdes": "等级基金第一次奖励",
+ "itemwt": 1000,
+ "min": 300000,
+ "max": 300000,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 1006,
+ "lotteryid": 22002001,
+ "description": "等级基金第一次奖励",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 220021,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itemdes": "等级基金第一次奖励",
+ "itemwt": 1000,
+ "min": 6,
+ "max": 6,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 1007,
+ "lotteryid": 22002002,
+ "description": "等级基金后续奖励",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 220022,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "itemdes": "等级基金后续奖励",
+ "itemwt": 1000,
+ "min": 100000,
+ "max": 100000,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 1008,
+ "lotteryid": 22002002,
+ "description": "等级基金后续奖励",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 220022,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itemdes": "等级基金后续奖励",
+ "itemwt": 1000,
+ "min": 2,
+ "max": 2,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_paypackage.json b/bin/json/game_paypackage.json
index d0567f667..9764755b0 100644
--- a/bin/json/game_paypackage.json
+++ b/bin/json/game_paypackage.json
@@ -25,12 +25,12 @@
{
"a": "attr",
"t": "diamond",
- "n": 50
+ "n": 20
},
{
- "a": "attr",
- "t": "ps",
- "n": 50
+ "a": "item",
+ "t": "10000003",
+ "n": 1
},
{
"a": "attr",
@@ -49,7 +49,7 @@
"text": "每日礼包2"
},
"packagetype": "day_1",
- "buy_num": 2,
+ "buy_num": 1,
"packagename": {
"key": "paypackage_paypackage_packagename_2",
"text": "每日礼包2"
@@ -65,11 +65,6 @@
"a": "item",
"t": "10000003",
"n": 3
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 120000
}
]
},
@@ -83,7 +78,7 @@
"text": "每日礼包3"
},
"packagetype": "day_2",
- "buy_num": 3,
+ "buy_num": 1,
"packagename": {
"key": "paypackage_paypackage_packagename_3",
"text": "每日礼包3"
@@ -97,13 +92,8 @@
},
{
"a": "item",
- "t": "10000001",
- "n": 6
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 300000
+ "t": "10000010",
+ "n": 20
}
]
},
@@ -117,7 +107,7 @@
"text": "每日礼包4"
},
"packagetype": "day_3",
- "buy_num": 3,
+ "buy_num": 1,
"packagename": {
"key": "paypackage_paypackage_packagename_4",
"text": "每日礼包4"
@@ -131,47 +121,13 @@
},
{
"a": "item",
- "t": "10000009",
- "n": 5
+ "t": "10000005",
+ "n": 3
},
{
"a": "attr",
"t": "gold",
- "n": 300000
- }
- ]
- },
- {
- "id": 5,
- "type": 1,
- "repeat_num": 0,
- "refreshtime": 1,
- "pagename": {
- "key": "paypackage_paypackage_pagename_5",
- "text": "每日礼包5"
- },
- "packagetype": "day_4",
- "buy_num": 3,
- "packagename": {
- "key": "paypackage_paypackage_packagename_5",
- "text": "每日礼包5"
- },
- "costitem": [],
- "item": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 1280
- },
- {
- "a": "item",
- "t": "10000013",
- "n": 5
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 300000
+ "n": 600000
}
]
},
@@ -214,7 +170,7 @@
"text": "每周礼包2"
},
"packagetype": "week_2",
- "buy_num": 2,
+ "buy_num": 1,
"packagename": {
"key": "paypackage_paypackage_packagename_7",
"text": "每周礼包2"
@@ -228,13 +184,13 @@
},
{
"a": "item",
- "t": "10000010",
- "n": 1
+ "t": "17010001",
+ "n": 15
},
{
- "a": "item",
- "t": "10000009",
- "n": 2
+ "a": "attr",
+ "t": "gold",
+ "n": 800000
}
]
},
@@ -248,7 +204,7 @@
"text": "每周礼包3"
},
"packagetype": "week_3",
- "buy_num": 3,
+ "buy_num": 2,
"packagename": {
"key": "paypackage_paypackage_packagename_8",
"text": "每周礼包3"
@@ -262,8 +218,8 @@
},
{
"a": "item",
- "t": "10000010",
- "n": 3
+ "t": "10000006",
+ "n": 2
}
]
},
@@ -277,7 +233,7 @@
"text": "每周礼包4"
},
"packagetype": "week_4",
- "buy_num": 4,
+ "buy_num": 3,
"packagename": {
"key": "paypackage_paypackage_packagename_9",
"text": "每周礼包4"
@@ -297,7 +253,7 @@
{
"a": "attr",
"t": "gold",
- "n": 5000000
+ "n": 3000000
}
]
},
@@ -317,64 +273,6 @@
"text": "每周礼包5"
},
"costitem": [],
- "item": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 4480
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 7500000
- }
- ]
- },
- {
- "id": 11,
- "type": 1,
- "repeat_num": 0,
- "refreshtime": 7,
- "pagename": {
- "key": "paypackage_paypackage_pagename_11",
- "text": "每周礼包6"
- },
- "packagetype": "week_6",
- "buy_num": 999,
- "packagename": {
- "key": "paypackage_paypackage_packagename_11",
- "text": "每周礼包6"
- },
- "costitem": [],
- "item": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 6480
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 10000000
- }
- ]
- },
- {
- "id": 12,
- "type": 1,
- "repeat_num": 0,
- "refreshtime": 7,
- "pagename": {
- "key": "paypackage_paypackage_pagename_12",
- "text": "每周礼包7"
- },
- "packagetype": "week_6",
- "buy_num": 999,
- "packagename": {
- "key": "paypackage_paypackage_packagename_12",
- "text": "每周礼包7"
- },
- "costitem": [],
"item": [
{
"a": "attr",
@@ -385,11 +283,6 @@
"a": "item",
"t": "10000001",
"n": 60
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 10000000
}
]
},
@@ -403,7 +296,7 @@
"text": "每月礼包1"
},
"packagetype": "month_2",
- "buy_num": 5,
+ "buy_num": 1,
"packagename": {
"key": "paypackage_paypackage_packagename_13",
"text": "每月礼包1"
@@ -413,12 +306,12 @@
{
"a": "attr",
"t": "diamond",
- "n": 980
+ "n": 300
},
{
"a": "item",
- "t": "10000006",
- "n": 100
+ "t": "17060008",
+ "n": 30
}
]
},
@@ -432,7 +325,7 @@
"text": "每月礼包2"
},
"packagetype": "month_2",
- "buy_num": 5,
+ "buy_num": 2,
"packagename": {
"key": "paypackage_paypackage_packagename_14",
"text": "每月礼包2"
@@ -442,12 +335,12 @@
{
"a": "attr",
"t": "diamond",
- "n": 980
+ "n": 680
},
{
"a": "item",
- "t": "17060008",
- "n": 85
+ "t": "13000001",
+ "n": 300
}
]
},
@@ -461,7 +354,7 @@
"text": "每月礼包3"
},
"packagetype": "month_2",
- "buy_num": 5,
+ "buy_num": 3,
"packagename": {
"key": "paypackage_paypackage_packagename_15",
"text": "每月礼包3"
@@ -471,12 +364,17 @@
{
"a": "attr",
"t": "diamond",
- "n": 980
+ "n": 1980
},
{
"a": "item",
- "t": "13000001",
- "n": 300
+ "t": "10000013",
+ "n": 5
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1500000
}
]
},
@@ -500,12 +398,51 @@
{
"a": "attr",
"t": "diamond",
- "n": 980
+ "n": 4480
},
{
"a": "item",
- "t": "13000002",
- "n": 20
+ "t": "17110001",
+ "n": 40
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 2500000
+ }
+ ]
+ },
+ {
+ "id": 17,
+ "type": 1,
+ "repeat_num": 0,
+ "refreshtime": 30,
+ "pagename": {
+ "key": "paypackage_paypackage_pagename_16",
+ "text": "每月礼包5"
+ },
+ "packagetype": "month_2",
+ "buy_num": 5,
+ "packagename": {
+ "key": "paypackage_paypackage_packagename_16",
+ "text": "每月礼包4"
+ },
+ "costitem": [],
+ "item": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 6480
+ },
+ {
+ "a": "item",
+ "t": "10000024",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 3000000
}
]
}
diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json
index a4d245f31..b492200de 100644
--- a/bin/json/game_recharge.json
+++ b/bin/json/game_recharge.json
@@ -457,5 +457,96 @@
"text": "0",
"show": "30元",
"image": ""
+ },
+ {
+ "id": "passcheck_3",
+ "editionid": "debug",
+ "recharge_type": 6,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": ""
+ },
+ {
+ "id": "passcheck_4",
+ "editionid": "debug",
+ "recharge_type": 6,
+ "monetaryunit": "￥",
+ "amount": 6800,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "68元",
+ "image": ""
+ },
+ {
+ "id": "passcheck_5",
+ "editionid": "debug",
+ "recharge_type": 6,
+ "monetaryunit": "￥",
+ "amount": 128000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "128元",
+ "image": ""
+ },
+ {
+ "id": "passcheck_6",
+ "editionid": "debug",
+ "recharge_type": 6,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": ""
+ },
+ {
+ "id": "passcheck_7",
+ "editionid": "debug",
+ "recharge_type": 6,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": ""
+ },
+ {
+ "id": "passcheck_8",
+ "editionid": "debug",
+ "recharge_type": 6,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": ""
+ },
+ {
+ "id": "passcheck_9",
+ "editionid": "debug",
+ "recharge_type": 6,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": ""
}
]
\ No newline at end of file
diff --git a/bin/json/game_shopcentercontrol.json b/bin/json/game_shopcentercontrol.json
index ea3c36e11..971a35be4 100644
--- a/bin/json/game_shopcentercontrol.json
+++ b/bin/json/game_shopcentercontrol.json
@@ -9,9 +9,9 @@
"index": 1,
"slogan": {
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3000% bonus!",
- "text": "购买礼包并通关所有简单模式主线，总计可获得超值3000%奖励！"
+ "text": "购买礼包并通关所有简单模式主线，总计可获得超值1200%奖励！"
},
- "point": "passcheck_4",
+ "point": "passcheck_3",
"restriction": 1,
"lv": 1,
"on": 0,
@@ -30,11 +30,11 @@
"index": 2,
"slogan": {
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3001% bonus!",
- "text": "购买礼包并通关所有困难模式主线，总计可获得超值3000%奖励！"
+ "text": "购买礼包并通关所有困难模式主线，总计可获得超值1200%奖励！"
},
- "point": "passcheck_5",
+ "point": "passcheck_4",
"restriction": 1,
- "lv": 2,
+ "lv": 1,
"on": 0,
"time": 0,
"times": 0,
@@ -51,11 +51,11 @@
"index": 3,
"slogan": {
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3002% bonus!",
- "text": "购买礼包并通关所有地狱模式主线，总计可获得超值3000%奖励！"
+ "text": "购买礼包并通关所有地狱模式主线，总计可获得超值1200%奖励！"
},
- "point": "passcheck_6",
+ "point": "passcheck_5",
"restriction": 1,
- "lv": 3,
+ "lv": 1,
"on": 0,
"time": 0,
"times": 0,
@@ -72,9 +72,9 @@
"index": 0,
"slogan": {
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3003% bonus!",
- "text": "购买礼包并达到相应的守护者等级，总计可获得超值3000%奖励！"
+ "text": "购买礼包并达到相应的守护者等级，总计可获得超值1800%奖励！"
},
- "point": "passcheck_7",
+ "point": "passcheck_6",
"restriction": 1,
"lv": 1,
"on": 0,
@@ -95,7 +95,7 @@
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3004% bonus!",
"text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
},
- "point": "passcheck_8",
+ "point": "passcheck_7",
"restriction": 1,
"lv": 1,
"on": 1,
@@ -116,7 +116,7 @@
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3005% bonus!",
"text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
},
- "point": "passcheck_9",
+ "point": "passcheck_8",
"restriction": 1,
"lv": 1,
"on": 2,
@@ -137,7 +137,7 @@
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3006% bonus!",
"text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
},
- "point": "passcheck_10",
+ "point": "passcheck_9",
"restriction": 1,
"lv": 1,
"on": 1,
diff --git a/bin/json/game_shopcenterfund.json b/bin/json/game_shopcenterfund.json
index 57343ec34..ba67f9b5d 100644
--- a/bin/json/game_shopcenterfund.json
+++ b/bin/json/game_shopcenterfund.json
@@ -3,77 +3,77 @@
"id": 200001,
"type": 2,
"unlock": 5,
- "group": 980,
+ "group": 22002001,
"position": 1
},
{
"id": 200002,
"type": 2,
"unlock": 10,
- "group": 981,
+ "group": 22002002,
"position": 2
},
{
"id": 200003,
"type": 2,
"unlock": 15,
- "group": 982,
+ "group": 22002002,
"position": 3
},
{
"id": 200004,
"type": 2,
"unlock": 20,
- "group": 983,
+ "group": 22002002,
"position": 4
},
{
"id": 200005,
"type": 2,
"unlock": 25,
- "group": 984,
+ "group": 22002002,
"position": 5
},
{
"id": 200006,
"type": 2,
"unlock": 30,
- "group": 985,
+ "group": 22002002,
"position": 6
},
{
"id": 200007,
"type": 2,
"unlock": 35,
- "group": 986,
+ "group": 22002002,
"position": 7
},
{
"id": 200008,
"type": 2,
"unlock": 40,
- "group": 987,
+ "group": 22002002,
"position": 8
},
{
"id": 200009,
"type": 2,
"unlock": 45,
- "group": 988,
+ "group": 22002002,
"position": 9
},
{
"id": 200010,
"type": 2,
"unlock": 50,
- "group": 989,
+ "group": 22002002,
"position": 10
},
{
"id": 200011,
"type": 2,
"unlock": 55,
- "group": 990,
+ "group": 22002002,
"position": 11
},
{
diff --git a/bin/json/game_shopcentersubmeter.json b/bin/json/game_shopcentersubmeter.json
index 25b806afe..7d22545c8 100644
--- a/bin/json/game_shopcentersubmeter.json
+++ b/bin/json/game_shopcentersubmeter.json
@@ -3,252 +3,252 @@
"id": 100001,
"index": 1,
"mianlevel": 20080,
- "group": 980,
+ "group": 22001001,
"position": 1
},
{
"id": 100002,
"index": 1,
"mianlevel": 20080,
- "group": 981,
+ "group": 22001001,
"position": 2
},
{
"id": 100003,
"index": 1,
"mianlevel": 20080,
- "group": 982,
+ "group": 22001001,
"position": 3
},
{
"id": 100004,
"index": 1,
"mianlevel": 20080,
- "group": 983,
+ "group": 22001001,
"position": 4
},
{
"id": 100005,
"index": 1,
"mianlevel": 20080,
- "group": 984,
+ "group": 22001001,
"position": 5
},
{
"id": 100006,
"index": 1,
"mianlevel": 20080,
- "group": 985,
+ "group": 22001001,
"position": 6
},
{
"id": 100007,
"index": 1,
"mianlevel": 20080,
- "group": 986,
+ "group": 22001001,
"position": 7
},
{
"id": 100008,
"index": 1,
"mianlevel": 20080,
- "group": 987,
+ "group": 22001001,
"position": 8
},
{
"id": 100009,
"index": 1,
"mianlevel": 20080,
- "group": 988,
+ "group": 22001001,
"position": 9
},
{
"id": 100010,
"index": 1,
"mianlevel": 20080,
- "group": 989,
+ "group": 22001001,
"position": 10
},
{
"id": 100011,
"index": 1,
"mianlevel": 20080,
- "group": 990,
+ "group": 22001001,
"position": 11
},
{
"id": 100012,
"index": 1,
"mianlevel": 20080,
- "group": 991,
+ "group": 22001001,
"position": 12
},
{
"id": 100013,
"index": 2,
"mianlevel": 20080,
- "group": 992,
+ "group": 22001002,
"position": 1
},
{
"id": 100014,
"index": 2,
"mianlevel": 20080,
- "group": 993,
+ "group": 22001002,
"position": 2
},
{
"id": 100015,
"index": 2,
"mianlevel": 20080,
- "group": 994,
+ "group": 22001002,
"position": 3
},
{
"id": 100016,
"index": 2,
"mianlevel": 20080,
- "group": 995,
+ "group": 22001002,
"position": 4
},
{
"id": 100017,
"index": 2,
"mianlevel": 20080,
- "group": 996,
+ "group": 22001002,
"position": 5
},
{
"id": 100018,
"index": 2,
"mianlevel": 20080,
- "group": 997,
+ "group": 22001002,
"position": 6
},
{
"id": 100019,
"index": 2,
"mianlevel": 20080,
- "group": 998,
+ "group": 22001002,
"position": 7
},
{
"id": 100020,
"index": 2,
"mianlevel": 20080,
- "group": 999,
+ "group": 22001002,
"position": 8
},
{
"id": 100021,
"index": 2,
"mianlevel": 20080,
- "group": 1000,
+ "group": 22001002,
"position": 9
},
{
"id": 100022,
"index": 2,
"mianlevel": 20080,
- "group": 1001,
+ "group": 22001002,
"position": 10
},
{
"id": 100023,
"index": 2,
"mianlevel": 20080,
- "group": 1002,
+ "group": 22001002,
"position": 11
},
{
"id": 100024,
"index": 2,
"mianlevel": 20080,
- "group": 1003,
+ "group": 22001002,
"position": 12
},
{
"id": 100025,
"index": 3,
"mianlevel": 20080,
- "group": 1004,
+ "group": 22001003,
"position": 1
},
{
"id": 100026,
"index": 3,
"mianlevel": 20080,
- "group": 1005,
+ "group": 22001003,
"position": 2
},
{
"id": 100027,
"index": 3,
"mianlevel": 20080,
- "group": 1006,
+ "group": 22001003,
"position": 3
},
{
"id": 100028,
"index": 3,
"mianlevel": 20080,
- "group": 1007,
+ "group": 22001003,
"position": 4
},
{
"id": 100029,
"index": 3,
"mianlevel": 20080,
- "group": 1008,
+ "group": 22001003,
"position": 5
},
{
"id": 100030,
"index": 3,
"mianlevel": 20080,
- "group": 1009,
+ "group": 22001003,
"position": 6
},
{
"id": 100031,
"index": 3,
"mianlevel": 20080,
- "group": 1010,
+ "group": 22001003,
"position": 7
},
{
"id": 100032,
"index": 3,
"mianlevel": 20080,
- "group": 1011,
+ "group": 22001003,
"position": 8
},
{
"id": 100033,
"index": 3,
"mianlevel": 20080,
- "group": 1012,
+ "group": 22001003,
"position": 9
},
{
"id": 100034,
"index": 3,
"mianlevel": 20080,
- "group": 1013,
+ "group": 22001003,
"position": 10
},
{
"id": 100035,
"index": 3,
"mianlevel": 20080,
- "group": 1014,
+ "group": 22001003,
"position": 11
},
{
"id": 100036,
"index": 3,
"mianlevel": 20080,
- "group": 1015,
+ "group": 22001003,
"position": 12
}
]
\ No newline at end of file
diff --git a/bin/json/game_stonebuff.json b/bin/json/game_stonebuff.json
index 3dc16c449..7d2e28ab5 100644
--- a/bin/json/game_stonebuff.json
+++ b/bin/json/game_stonebuff.json
@@ -5,7 +5,7 @@
"SkillId": 770001111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -30,7 +30,7 @@
"SkillId": 770001111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -55,7 +55,7 @@
"SkillId": 770002111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -80,7 +80,7 @@
"SkillId": 770002111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -105,7 +105,7 @@
"SkillId": 770003111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -130,7 +130,7 @@
"SkillId": 770003111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -155,7 +155,7 @@
"SkillId": 770004111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -180,7 +180,7 @@
"SkillId": 770004111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -205,7 +205,7 @@
"SkillId": 770005111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -230,7 +230,7 @@
"SkillId": 770005111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -255,7 +255,7 @@
"SkillId": 770006111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -280,7 +280,7 @@
"SkillId": 770006111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -305,7 +305,7 @@
"SkillId": 770007111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -330,7 +330,7 @@
"SkillId": 770007111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -355,7 +355,7 @@
"SkillId": 770008111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 1,
@@ -380,7 +380,7 @@
"SkillId": 770008111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 1,
@@ -405,7 +405,7 @@
"SkillId": 770009111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -430,7 +430,7 @@
"SkillId": 770009111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -455,7 +455,7 @@
"SkillId": 770010111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -480,7 +480,7 @@
"SkillId": 770010111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -505,7 +505,7 @@
"SkillId": 770011111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -530,7 +530,7 @@
"SkillId": 770011111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -555,7 +555,7 @@
"SkillId": 770012111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -580,7 +580,7 @@
"SkillId": 770012111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -605,7 +605,7 @@
"SkillId": 770013111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -630,7 +630,7 @@
"SkillId": 770013111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -655,7 +655,7 @@
"SkillId": 770014111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -680,7 +680,7 @@
"SkillId": 770014111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -705,7 +705,7 @@
"SkillId": 770015111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -730,7 +730,7 @@
"SkillId": 770015111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -755,7 +755,7 @@
"SkillId": 770016111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -780,7 +780,7 @@
"SkillId": 770016111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -805,7 +805,7 @@
"SkillId": 770017111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -830,7 +830,7 @@
"SkillId": 770017111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -855,7 +855,7 @@
"SkillId": 770018111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -880,7 +880,7 @@
"SkillId": 770018111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -905,7 +905,7 @@
"SkillId": 770019111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -930,7 +930,7 @@
"SkillId": 770019111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -955,7 +955,7 @@
"SkillId": 770020111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -980,7 +980,7 @@
"SkillId": 770020111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1005,7 +1005,7 @@
"SkillId": 770021111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1030,7 +1030,7 @@
"SkillId": 770021111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1055,7 +1055,7 @@
"SkillId": 770022111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1080,7 +1080,7 @@
"SkillId": 770022111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1105,7 +1105,7 @@
"SkillId": 770023111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1130,7 +1130,7 @@
"SkillId": 770023111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1155,7 +1155,7 @@
"SkillId": 770024111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1180,7 +1180,7 @@
"SkillId": 770024111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1205,7 +1205,7 @@
"SkillId": 770025111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1230,7 +1230,7 @@
"SkillId": 770025111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1255,7 +1255,7 @@
"SkillId": 770026111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1280,7 +1280,7 @@
"SkillId": 770026111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1305,7 +1305,7 @@
"SkillId": 770027111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1330,7 +1330,7 @@
"SkillId": 770027111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1355,7 +1355,7 @@
"SkillId": 770028111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1380,7 +1380,7 @@
"SkillId": 770028111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1405,7 +1405,7 @@
"SkillId": 770029111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1430,7 +1430,7 @@
"SkillId": 770029111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1455,7 +1455,7 @@
"SkillId": 770030111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1480,7 +1480,7 @@
"SkillId": 770030111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1505,7 +1505,7 @@
"SkillId": 770031111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1530,7 +1530,7 @@
"SkillId": 770031111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1555,7 +1555,7 @@
"SkillId": 770032111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 1,
@@ -1580,7 +1580,7 @@
"SkillId": 770032111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 1,
@@ -1605,7 +1605,7 @@
"SkillId": 770033111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1630,7 +1630,7 @@
"SkillId": 770033111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1655,7 +1655,7 @@
"SkillId": 770034111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1680,7 +1680,7 @@
"SkillId": 770034111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1705,7 +1705,7 @@
"SkillId": 770035111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1730,7 +1730,7 @@
"SkillId": 770035111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1755,7 +1755,7 @@
"SkillId": 770036111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1780,7 +1780,7 @@
"SkillId": 770036111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1805,7 +1805,7 @@
"SkillId": 770037111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1830,7 +1830,7 @@
"SkillId": 770037111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1855,7 +1855,7 @@
"SkillId": 770038111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1880,7 +1880,7 @@
"SkillId": 770038111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1905,7 +1905,7 @@
"SkillId": 770039111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1930,7 +1930,7 @@
"SkillId": 770039111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1955,7 +1955,7 @@
"SkillId": 770040111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -1980,7 +1980,7 @@
"SkillId": 770040111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2005,7 +2005,7 @@
"SkillId": 770041111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2030,7 +2030,7 @@
"SkillId": 770041111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2055,7 +2055,7 @@
"SkillId": 770042111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2080,7 +2080,7 @@
"SkillId": 770042111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2105,7 +2105,7 @@
"SkillId": 770043111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2130,7 +2130,7 @@
"SkillId": 770043111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2155,7 +2155,7 @@
"SkillId": 770044111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2180,7 +2180,7 @@
"SkillId": 770044111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2205,7 +2205,7 @@
"SkillId": 770045111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2230,7 +2230,7 @@
"SkillId": 770045111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2255,7 +2255,7 @@
"SkillId": 770046111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2280,7 +2280,7 @@
"SkillId": 770046111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2305,7 +2305,7 @@
"SkillId": 770047111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2330,7 +2330,7 @@
"SkillId": 770047111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2355,7 +2355,7 @@
"SkillId": 770048111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2380,7 +2380,7 @@
"SkillId": 770048111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2405,7 +2405,7 @@
"SkillId": 770049111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2430,7 +2430,7 @@
"SkillId": 770049111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2455,7 +2455,7 @@
"SkillId": 770050111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2480,7 +2480,7 @@
"SkillId": 770050111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2505,7 +2505,7 @@
"SkillId": 770051111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2530,7 +2530,7 @@
"SkillId": 770051111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2555,7 +2555,7 @@
"SkillId": 770052111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2580,7 +2580,7 @@
"SkillId": 770052111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2605,7 +2605,7 @@
"SkillId": 770053111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2630,7 +2630,7 @@
"SkillId": 770053111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2655,7 +2655,7 @@
"SkillId": 770054111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2680,7 +2680,7 @@
"SkillId": 770054111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2705,7 +2705,7 @@
"SkillId": 770055111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2730,7 +2730,7 @@
"SkillId": 770055111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2755,7 +2755,7 @@
"SkillId": 770056111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2780,7 +2780,7 @@
"SkillId": 770056111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2805,7 +2805,7 @@
"SkillId": 770057111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2830,7 +2830,7 @@
"SkillId": 770057111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2855,7 +2855,7 @@
"SkillId": 770058111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2880,7 +2880,7 @@
"SkillId": 770058111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2905,7 +2905,7 @@
"SkillId": 770059111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2930,7 +2930,7 @@
"SkillId": 770059111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "2",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -2955,7 +2955,7 @@
"SkillId": 770060111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 1,
@@ -2980,7 +2980,7 @@
"SkillId": 770060111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 1,
@@ -3005,7 +3005,7 @@
"SkillId": 770061111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3030,7 +3030,7 @@
"SkillId": 770061111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3055,7 +3055,7 @@
"SkillId": 770062111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3080,7 +3080,7 @@
"SkillId": 770062111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3105,7 +3105,7 @@
"SkillId": 770063111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3130,7 +3130,7 @@
"SkillId": 770063111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3155,7 +3155,7 @@
"SkillId": 770064111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3180,7 +3180,7 @@
"SkillId": 770064111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3205,7 +3205,7 @@
"SkillId": 770065111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3230,7 +3230,7 @@
"SkillId": 770065111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3255,7 +3255,7 @@
"SkillId": 770066111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3280,7 +3280,7 @@
"SkillId": 770066111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3305,7 +3305,7 @@
"SkillId": 770067111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3330,7 +3330,7 @@
"SkillId": 770067111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3355,7 +3355,7 @@
"SkillId": 770068111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3380,7 +3380,7 @@
"SkillId": 770068111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3405,7 +3405,7 @@
"SkillId": 770069111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3430,7 +3430,7 @@
"SkillId": 770069111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3455,7 +3455,7 @@
"SkillId": 770070111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3480,7 +3480,7 @@
"SkillId": 770070111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3505,7 +3505,7 @@
"SkillId": 770071111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3530,7 +3530,7 @@
"SkillId": 770071111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3555,7 +3555,7 @@
"SkillId": 770072111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3580,7 +3580,7 @@
"SkillId": 770072111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3605,7 +3605,7 @@
"SkillId": 770073111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3630,7 +3630,7 @@
"SkillId": 770073111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3655,7 +3655,7 @@
"SkillId": 770074111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3680,7 +3680,7 @@
"SkillId": 770074111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "1",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3705,7 +3705,7 @@
"SkillId": 770075111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3730,7 +3730,7 @@
"SkillId": 770075111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3755,7 +3755,7 @@
"SkillId": 770076111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3780,7 +3780,7 @@
"SkillId": 770076111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3805,7 +3805,7 @@
"SkillId": 770077111,
"BuffLevel": 1,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3830,7 +3830,7 @@
"SkillId": 770077111,
"BuffLevel": 2,
"Quality": 1,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3855,7 +3855,7 @@
"SkillId": 770078111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3880,7 +3880,7 @@
"SkillId": 770078111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "3",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3905,7 +3905,7 @@
"SkillId": 770079111,
"BuffLevel": 1,
"Quality": 3,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3930,7 +3930,7 @@
"SkillId": 770079111,
"BuffLevel": 2,
"Quality": 3,
- "BuffIcon": "5",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3955,7 +3955,7 @@
"SkillId": 770080111,
"BuffLevel": 1,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
@@ -3980,7 +3980,7 @@
"SkillId": 770080111,
"BuffLevel": 2,
"Quality": 2,
- "BuffIcon": "4",
+ "BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
diff --git a/bin/json/game_taskactivereward.json b/bin/json/game_taskactivereward.json
index 49f6a4c3d..932e88a92 100644
--- a/bin/json/game_taskactivereward.json
+++ b/bin/json/game_taskactivereward.json
@@ -8,16 +8,6 @@
"a": "attr",
"t": "diamond",
"n": 150
- },
- {
- "a": "item",
- "t": "17010000",
- "n": 50
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 1000000
}
],
"action": "main_weektask_action_1_act",
@@ -33,15 +23,10 @@
"t": "diamond",
"n": 150
},
- {
- "a": "item",
- "t": "17010000",
- "n": 100
- },
{
"a": "attr",
"t": "gold",
- "n": 1000000
+ "n": 500000
}
],
"action": "main_weektask_action_1_act",
@@ -57,15 +42,10 @@
"t": "diamond",
"n": 150
},
- {
- "a": "item",
- "t": "17010000",
- "n": 100
- },
{
"a": "attr",
"t": "gold",
- "n": 1000000
+ "n": 600000
}
],
"action": "main_weektask_action_1_act",
@@ -81,15 +61,10 @@
"t": "diamond",
"n": 150
},
- {
- "a": "item",
- "t": "17010000",
- "n": 100
- },
{
"a": "attr",
"t": "gold",
- "n": 1000000
+ "n": 600000
}
],
"action": "main_weektask_action_1_act",
diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json
index c91d66098..3156cd3b7 100644
--- a/bin/json/game_taskround.json
+++ b/bin/json/game_taskround.json
@@ -3,6 +3,7 @@
"key": 20001,
"id_list": 1,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_1",
"text": "本周竞技场挑战10次"
@@ -29,6 +30,7 @@
"key": 20002,
"id_list": 2,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_2",
"text": "本周竞技场挑战30次"
@@ -55,6 +57,7 @@
"key": 20003,
"id_list": 3,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_3",
"text": "本周竞技场挑战50次"
@@ -81,6 +84,7 @@
"key": 20004,
"id_list": 4,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_4",
"text": "本周竞技场胜利10次"
@@ -107,6 +111,7 @@
"key": 20005,
"id_list": 5,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_5",
"text": "本周竞技场胜利20次"
@@ -133,6 +138,7 @@
"key": 20006,
"id_list": 6,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_6",
"text": "本周竞技场胜利30次"
@@ -159,6 +165,7 @@
"key": 20007,
"id_list": 7,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_7",
"text": "本周累计经验副本消耗300体力"
@@ -185,6 +192,7 @@
"key": 20008,
"id_list": 8,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_8",
"text": "本周累计经验副本消耗600体力"
@@ -211,6 +219,7 @@
"key": 20009,
"id_list": 9,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_9",
"text": "本周累计经验副本消耗1000体力"
@@ -237,6 +246,7 @@
"key": 20010,
"id_list": 10,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_10",
"text": "本周累计消耗3000000点金币"
@@ -263,6 +273,7 @@
"key": 20011,
"id_list": 11,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_11",
"text": "本周累计消耗6000000点金币"
@@ -289,6 +300,7 @@
"key": 20012,
"id_list": 12,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_12",
"text": "本周累计消耗10000000点金币"
@@ -315,6 +327,7 @@
"key": 20013,
"id_list": 13,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_13",
"text": "本周累计装备副本消耗300体力"
@@ -341,6 +354,7 @@
"key": 20014,
"id_list": 14,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_14",
"text": "本周累计装备副本消耗600体力"
@@ -367,6 +381,7 @@
"key": 20015,
"id_list": 15,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_15",
"text": "本周累计装备副本消耗1000体力"
@@ -393,6 +408,7 @@
"key": 20016,
"id_list": 16,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_16",
"text": "本周累计回响副本消耗300体力"
@@ -419,6 +435,7 @@
"key": 20017,
"id_list": 17,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_17",
"text": "本周累计回响副本消耗600体力"
@@ -445,6 +462,7 @@
"key": 20018,
"id_list": 18,
"id_tag": 2,
+ "open": "",
"task_display": {
"key": "task_task_round_task_display_18",
"text": "本周累计回响副本消耗1000体力"
diff --git a/modules/caravan/comp_configure.go b/modules/caravan/comp_configure.go
index 8b801e6f8..174805af5 100644
--- a/modules/caravan/comp_configure.go
+++ b/modules/caravan/comp_configure.go
@@ -197,12 +197,11 @@ func (this *configureComp) GetCaravanInitCity() (initcity int32) {
// 获取商店刷新时间
func (this *configureComp) GetCityRefreshTime() int32 {
- if v, err := this.GetConfigure(game_caravan); err == nil {
- if configure, ok := v.(*cfg.GameCaravanCity); ok {
+ if v, err := this.GetConfigure(game_caravan_thing); err == nil {
+ if configure, ok := v.(*cfg.GameCaravanThing); ok {
for _, v := range configure.GetDataList() {
- return v.Checktime
+ return v.Changetime
}
-
}
} else {
log.Errorf("get GetCaravanInitCity conf err:%v", err)
diff --git a/modules/caravan/model_caravan.go b/modules/caravan/model_caravan.go
index 9fd42d6db..a9d0aed45 100644
--- a/modules/caravan/model_caravan.go
+++ b/modules/caravan/model_caravan.go
@@ -53,6 +53,8 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err
result.Resettime = configure.Now().Unix() - (subTime % sTime) + sTime
//result.Resettime = +int64(this.module.ModuleTools.GetGlobalConf().BusinessRewardday * 24 * 3600)
result.Citystime = configure.Now().Unix()
+ result.Rtime = configure.Now().Unix()
+
result.Lv = 1
result.Curcity = this.module.configure.GetCaravanInitCity() // 获取默认城市
if conf, err := this.module.configure.GetCaravanLv(result.Lv); err == nil {
diff --git a/modules/caravan/module.go b/modules/caravan/module.go
index f0e64f697..39aef14fb 100644
--- a/modules/caravan/module.go
+++ b/modules/caravan/module.go
@@ -119,7 +119,6 @@ func (this *Caravan) InitCaravanCityData(uid string, data *pb.DBCaravan) {
city.Nextexspecial = append(city.Nextexspecial, v.Exspecial...)
}
- //city.ExspecialPCT = v.Exspecialnum[comm.GetRandW(v.ExspecialnumWeight)] // 获取权重
city.NextexspecialPCT = v.Exspecialnum[int(comm.GetRandW(v.ExspecialnumWeight))] // 获取权重
data.City[v.Id] = city
}
@@ -166,28 +165,67 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
curTime = configure.Now().Unix()
update = make(map[string]interface{})
changeTime = this.configure.GetCityRefreshTime() // 3分钟
- subTime := int32(curTime - caravan.Citystime)
- if subTime >= changeTime {
- bChange = true
- for k, v := range caravan.City {
- if c, _ := this.configure.GetCaravanCity(k); c != nil {
+
+ // 刷新城市货物信息
+ if !utils.IsToday(caravan.Citystime) {
+ list := this.configure.GetAllCaravanCity()
+ for _, conf := range list {
+ if v, ok := caravan.City[conf.Id]; ok {
v.Count = make(map[string]int32) // 初始化城市信息
v.Special = []string{}
- if len(c.Special) > int(c.Citytypenum) {
- ids := utils.RandomNumbers(0, len(c.Special), int(c.Citytypenum))
+ if len(conf.Special) > int(conf.Citytypenum) {
+ ids := utils.RandomNumbers(0, len(conf.Special), int(conf.Citytypenum))
for _, id := range ids {
- v.Special = append(v.Special, c.Special[id])
+ v.Special = append(v.Special, conf.Special[id])
}
} else {
- v.Special = append(v.Special, c.Special...)
+ v.Special = append(v.Special, conf.Special...)
}
+
+ if utils.IsToday(caravan.Citystime - 24*3600) {
+ v.Exspecial = make([]string, 0)
+ v.Exspecial = append(v.Exspecial, v.Nextexspecial...)
+ v.ExspecialPCT = v.NextexspecialPCT
+ } else { // 初始化今天
+ v.Exspecial = make([]string, 0)
+ // 初始化下一天的信息
+ if len(v.Exspecial) > int(conf.ExspecialNum) {
+ ids := utils.RandomNumbers(0, len(conf.Exspecial), int(conf.ExspecialNum))
+ for _, id := range ids {
+ v.Exspecial = append(v.Exspecial, conf.Exspecial[id])
+ }
+ } else {
+ v.Exspecial = append(v.Exspecial, conf.Exspecial...)
+ }
+ v.ExspecialPCT = conf.Exspecialnum[comm.GetRandW(conf.ExspecialnumWeight)] // 获取权重
+ }
+ /////////////////////
+ v.Nextexspecial = []string{}
+ // 初始化下一天的信息
+ if len(v.Exspecial) > int(conf.ExspecialNum) {
+ ids := utils.RandomNumbers(0, len(conf.Exspecial), int(conf.ExspecialNum))
+ for _, id := range ids {
+ v.Nextexspecial = append(v.Nextexspecial, conf.Exspecial[id])
+ }
+ } else {
+ v.Nextexspecial = append(v.Nextexspecial, conf.Exspecial...)
+ }
+ v.NextexspecialPCT = conf.Exspecialnum[comm.GetRandW(conf.ExspecialnumWeight)] // 获取权重
+
}
+
}
+ caravan.Citystime = configure.Now().Unix() // 设置今天的时间
update["city"] = caravan.City
+ update["citystime"] = caravan.Citystime
+ }
+ subTime := int32(curTime - caravan.Itemtime)
+ if subTime >= changeTime {
+ bChange = true
icount := int32(subTime / changeTime) // 循环周期
- caravan.Citystime += int64(changeTime * icount)
- update["citystime"] = caravan.Citystime
+ caravan.Itemtime += int64(changeTime * icount)
+ update["citystime"] = caravan.Itemtime
for k, v := range caravan.Goods {
if c, err := this.configure.GetCaravanGoods(k); err == nil {
caravan.Oldprice[k] = v.Price
@@ -237,54 +275,17 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
}
}
}
+ update["itemtime"] = caravan.Itemtime
update["goods"] = caravan.Goods
update["oldprice"] = caravan.Oldprice
}
- endTime := utils.WeekIntervalTime(0)
- if caravan.Resettime != endTime {
- caravan.Resettime = endTime
- update["resettime"] = caravan.Resettime
- bChange = true
- }
+ // endTime := utils.WeekIntervalTime(0)
+ // if caravan.Resettime != endTime {
+ // caravan.Resettime = endTime
+ // update["resettime"] = caravan.Resettime
+ // bChange = true
+ // }
- if utils.IsToday(caravan.Rtime) { // 是今天
- list := this.configure.GetAllCaravanCity()
- for _, conf := range list {
- if v, ok := caravan.City[conf.Id]; ok {
- if len(v.Nextexspecial) == 0 || v.NextexspecialPCT == 0 { // 没有数据 则构建一条数据
- if len(v.Exspecial) > int(conf.ExspecialNum) {
- ids := utils.RandomNumbers(0, len(conf.Exspecial), int(conf.ExspecialNum))
- for _, id := range ids {
- v.Exspecial = append(v.Exspecial, conf.Exspecial[id])
- }
- } else {
- v.Exspecial = append(v.Exspecial, conf.Exspecial...)
- }
- v.ExspecialPCT = conf.Exspecialnum[comm.GetRandW(conf.ExspecialnumWeight)] // 获取权重
- } else {
- v.Exspecial = make([]string, 0)
- v.Exspecial = append(v.Exspecial, v.Nextexspecial...)
- v.ExspecialPCT = v.NextexspecialPCT
- }
- v.Nextexspecial = []string{}
- // 初始化下一天的信息
- if len(v.Exspecial) > int(conf.ExspecialNum) {
- ids := utils.RandomNumbers(0, len(conf.Exspecial), int(conf.ExspecialNum))
- for _, id := range ids {
- v.Nextexspecial = append(v.Nextexspecial, conf.Exspecial[id])
- }
- } else {
- v.Nextexspecial = append(v.Nextexspecial, conf.Exspecial...)
- }
- v.NextexspecialPCT = conf.Exspecialnum[comm.GetRandW(conf.ExspecialnumWeight)] // 获取权重
- }
-
- }
- caravan.Rtime = caravan.Rtime + 24*3600
- update["rtime"] = caravan.Rtime
- update["city"] = caravan.City
- bChange = true
- }
if bChange {
this.modelCaravan.modifyCaravanDataByObjId(uid, update)
}
diff --git a/pb/caravan_db.pb.go b/pb/caravan_db.pb.go
index b8b5a2de6..cb428c94e 100644
--- a/pb/caravan_db.pb.go
+++ b/pb/caravan_db.pb.go
@@ -244,11 +244,12 @@ type DBCaravan struct {
Eventid int32 `protobuf:"varint,12,opt,name=eventid,proto3" json:"eventid"` // 特殊事件ID(事件配置唯一id)
Tasktime int64 `protobuf:"varint,13,opt,name=tasktime,proto3" json:"tasktime"` // 任务触发时间
Baglimit int32 `protobuf:"varint,14,opt,name=baglimit,proto3" json:"baglimit"` // 背包上限
- Citystime int64 `protobuf:"varint,15,opt,name=citystime,proto3" json:"citystime"` // 城市刷新时间 玩家身上的货物同时刷新
+ Citystime int64 `protobuf:"varint,15,opt,name=citystime,proto3" json:"citystime"` // 城市刷新时间 固定每天0点刷新
Oldprice map[string]int32 `protobuf:"bytes,16,rep,name=oldprice,proto3" json:"oldprice" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 上一次价格 key 货物ID
Rtime int64 `protobuf:"varint,17,opt,name=rtime,proto3" json:"rtime"` // 客户端不用这个时间
Group map[int32]bool `protobuf:"bytes,18,rep,name=group,proto3" json:"group" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //服务器用
Reward map[int32]bool `protobuf:"bytes,19,rep,name=reward,proto3" json:"reward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 记录盈利奖励
+ Itemtime int64 `protobuf:"varint,20,opt,name=itemtime,proto3" json:"itemtime"` // 玩家身上的货物同时刷新
}
func (x *DBCaravan) Reset() {
@@ -409,6 +410,13 @@ func (x *DBCaravan) GetReward() map[int32]bool {
return nil
}
+func (x *DBCaravan) GetItemtime() int64 {
+ if x != nil {
+ return x.Itemtime
+ }
+ return 0
+}
+
type CaravanRankInfo struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -535,7 +543,7 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{
0x22, 0x35, 0x0a, 0x07, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x63,
0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0xbe, 0x07, 0x0a, 0x09, 0x44, 0x42, 0x43, 0x61,
+ 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0xda, 0x07, 0x0a, 0x09, 0x44, 0x42, 0x43, 0x61,
0x72, 0x61, 0x76, 0x61, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
@@ -571,44 +579,46 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x2e, 0x0a, 0x06,
0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44,
0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45,
- 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x42, 0x0a, 0x0a,
- 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
- 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x05,
- 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x61,
- 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
- 0x1a, 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
- 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
- 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
- 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
- 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
- 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c,
- 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69,
- 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
- 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
- 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x45, 0x6e, 0x74, 0x72,
- 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
- 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a,
- 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
- 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
- 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbf, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72,
- 0x61, 0x76, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03,
- 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12,
- 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
- 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76,
- 0x61, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74,
- 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61,
- 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d,
- 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09,
- 0x63, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x09, 0x63, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
- 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08,
+ 0x69, 0x74, 0x65, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
+ 0x69, 0x74, 0x65, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x42, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d,
+ 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66,
+ 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x0a,
+ 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+ 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f,
+ 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42,
+ 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+ 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43,
+ 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+ 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
+ 0x38, 0x0a, 0x0a, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+ 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+ 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77,
+ 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
+ 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbf, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e,
+ 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+ 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16,
+ 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+ 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
+ 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x12,
+ 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61,
+ 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f,
+ 0x6e, 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68,
+ 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x61,
+ 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x61, 0x72,
+ 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/sys/configure/structs/Game.Accumulate.go b/sys/configure/structs/Game.Accumulate.go
new file mode 100644
index 000000000..759cd25de
--- /dev/null
+++ b/sys/configure/structs/Game.Accumulate.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameAccumulate struct {
+ _dataMap map[int32]*GameAccumulateData
+ _dataList []*GameAccumulateData
+}
+
+func NewGameAccumulate(_buf []map[string]interface{}) (*GameAccumulate, error) {
+ _dataList := make([]*GameAccumulateData, 0, len(_buf))
+ dataMap := make(map[int32]*GameAccumulateData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameAccumulateData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Integral] = _v
+ }
+ }
+ return &GameAccumulate{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameAccumulate) GetDataMap() map[int32]*GameAccumulateData {
+ return table._dataMap
+}
+
+func (table *GameAccumulate) GetDataList() []*GameAccumulateData {
+ return table._dataList
+}
+
+func (table *GameAccumulate) Get(key int32) *GameAccumulateData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.AccumulateData.go b/sys/configure/structs/Game.AccumulateData.go
new file mode 100644
index 000000000..4455c12c3
--- /dev/null
+++ b/sys/configure/structs/Game.AccumulateData.go
@@ -0,0 +1,50 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameAccumulateData struct {
+ Integral int32
+ Reward []*Gameatn
+}
+
+const TypeId_GameAccumulateData = 242378152
+
+func (*GameAccumulateData) GetTypeId() int32 {
+ return 242378152
+}
+
+func (_v *GameAccumulateData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["integral"].(float64); !_ok_ { err = errors.New("integral error"); return }; _v.Integral = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
+
+ _v.Reward = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Reward = append(_v.Reward, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameAccumulateData(_buf map[string]interface{}) (*GameAccumulateData, error) {
+ v := &GameAccumulateData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go
index a5ade2ebe..b7944e41f 100644
--- a/sys/configure/structs/Game.BuffType.go
+++ b/sys/configure/structs/Game.BuffType.go
@@ -95,4 +95,5 @@ const (
GameBuffType_BE_CRIT_ADD_THIS_TIME_DMG = 83
GameBuffType_EFFMUSTHIT = 84
GameBuffType_PROPERTY_LOW_ADD_DMG = 85
+ GameBuffType_REPLACE_BUFF = 86
)
diff --git a/sys/configure/structs/Game.CaravanThingData.go b/sys/configure/structs/Game.CaravanThingData.go
index 4f6a6ed13..a43cca6fd 100644
--- a/sys/configure/structs/Game.CaravanThingData.go
+++ b/sys/configure/structs/Game.CaravanThingData.go
@@ -14,6 +14,7 @@ type GameCaravanThingData struct {
Itemid string
Goodsprice int32
Changeperiod []int32
+ Changetime int32
PriceChangeWeight []int32
PriceChangeWeightOne []int32
PriceChangeWeightTwo []int32
@@ -48,6 +49,7 @@ func (_v *GameCaravanThingData)Deserialize(_buf map[string]interface{}) (err err
}
}
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["changetime"].(float64); !_ok_ { err = errors.New("changetime error"); return }; _v.Changetime = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
diff --git a/sys/configure/structs/Game.FightEventType.go b/sys/configure/structs/Game.FightEventType.go
index 182404e5b..b016b1e6d 100644
--- a/sys/configure/structs/Game.FightEventType.go
+++ b/sys/configure/structs/Game.FightEventType.go
@@ -38,4 +38,7 @@ const (
GameFightEventType_OnWaitInputSkill = 26
GameFightEventType_OnBuffOverlayNumChange = 27
GameFightEventType_OnCleanSkillExecute = 28
+ GameFightEventType_OnStealBuffEnd = 29
+ GameFightEventType_OnRebirthEnd = 30
+ GameFightEventType_OnShiftBuffEnd = 31
)
diff --git a/sys/configure/structs/Game.GuidanceData.go b/sys/configure/structs/Game.GuidanceData.go
index bb198b667..9e3ec5f6c 100644
--- a/sys/configure/structs/Game.GuidanceData.go
+++ b/sys/configure/structs/Game.GuidanceData.go
@@ -16,6 +16,7 @@ type GameGuidanceData struct {
Jumpid int32
Index int32
Intr string
+ Opencondid string
}
const TypeId_GameGuidanceData = 593350558
@@ -30,6 +31,7 @@ func (_v *GameGuidanceData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpid"].(float64); !_ok_ { err = errors.New("jumpid error"); return }; _v.Jumpid = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.Opencondid, _ok_ = _buf["opencondid"].(string); !_ok_ { err = errors.New("opencondid error"); return } }
return
}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index e010249d2..10a4a9d4e 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -226,6 +226,7 @@ type Tables struct {
ShopCenterControl *GameShopCenterControl
ShopCenterSubmeter *GameShopCenterSubmeter
ShopCenterFund *GameShopCenterFund
+ Accumulate *GameAccumulate
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1523,5 +1524,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.ShopCenterFund, err = NewGameShopCenterFund(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_accumulate") ; err != nil {
+ return nil, err
+ }
+ if tables.Accumulate, err = NewGameAccumulate(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.taskRoundData.go b/sys/configure/structs/game.taskRoundData.go
index 98a3c6118..116018e14 100644
--- a/sys/configure/structs/game.taskRoundData.go
+++ b/sys/configure/structs/game.taskRoundData.go
@@ -14,6 +14,7 @@ type GameTaskRoundData struct {
Key int32
IdList int32
IdTag int32
+ Open string
TaskDisplay string
TypeId int32
Active int32
@@ -33,6 +34,7 @@ func (_v *GameTaskRoundData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_list"].(float64); !_ok_ { err = errors.New("id_list error"); return }; _v.IdList = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_tag"].(float64); !_ok_ { err = errors.New("id_tag error"); return }; _v.IdTag = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Open, _ok_ = _buf["open"].(string); !_ok_ { err = errors.New("open error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type_id"].(float64); !_ok_ { err = errors.New("type_id error"); return }; _v.TypeId = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["active"].(float64); !_ok_ { err = errors.New("active error"); return }; _v.Active = int32(_tempNum_) }