From 6644a652ff1229f63a1c688425586a8f480a634a Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 21 Feb 2024 17:25:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_annulartaskall.json | 116 +++++-
bin/json/game_buriedcondi.json | 35 +-
bin/json/game_dispatch_task.json | 20 +-
bin/json/game_global.json | 4 +-
bin/json/game_horoscope.json | 104 +++---
bin/json/game_item.json | 186 ++++++---
bin/json/game_navigation.json | 2 +-
bin/json/game_puggsyevent.json | 374 ++++++++++++++-----
bin/json/game_puggsyrecruit.json | 18 +-
bin/json/game_puggsyscore.json | 289 ++------------
bin/json/game_puggsystar.json | 66 +++-
bin/json/game_rdtasknpc.json | 6 +-
bin/json/game_ruledesc.json | 46 ++-
bin/json/game_worldrd.json | 90 +++++
sys/configure/structs/Game.WorldRdData.go | 4 +
sys/configure/structs/TEnum.HoroscopeType.go | 14 +
16 files changed, 846 insertions(+), 528 deletions(-)
create mode 100644 sys/configure/structs/TEnum.HoroscopeType.go
diff --git a/bin/json/game_annulartaskall.json b/bin/json/game_annulartaskall.json
index 31190b2a1..27ee5b504 100644
--- a/bin/json/game_annulartaskall.json
+++ b/bin/json/game_annulartaskall.json
@@ -2,11 +2,30 @@
{
"taskgroup": 10010,
"taskdetail": [
- 60000010,
- 60000070,
- 60000080,
- 60000090,
- 60000100
+ 60000370,
+ 60000380,
+ 60000390,
+ 60000400,
+ 60000410,
+ 60000420,
+ 60000430,
+ 60000440,
+ 60000450,
+ 60000460,
+ 60000470,
+ 60000480,
+ 60000490,
+ 60000500,
+ 60000510,
+ 60000520,
+ 60000530,
+ 60000540,
+ 60000550,
+ 60000560,
+ 60000570,
+ 60000580,
+ 60000590,
+ 60000600
],
"weight": 2500,
"reward": [
@@ -25,11 +44,30 @@
{
"taskgroup": 10020,
"taskdetail": [
- 60000110,
- 60000120,
- 60000130,
- 60000140,
- 60000150
+ 60000370,
+ 60000380,
+ 60000390,
+ 60000400,
+ 60000410,
+ 60000420,
+ 60000430,
+ 60000440,
+ 60000450,
+ 60000460,
+ 60000470,
+ 60000480,
+ 60000490,
+ 60000500,
+ 60000510,
+ 60000520,
+ 60000530,
+ 60000540,
+ 60000550,
+ 60000560,
+ 60000570,
+ 60000580,
+ 60000590,
+ 60000600
],
"weight": 2500,
"reward": [
@@ -48,11 +86,30 @@
{
"taskgroup": 10030,
"taskdetail": [
- 60000160,
- 60000170,
- 60000180,
- 60000190,
- 60000200
+ 60000370,
+ 60000380,
+ 60000390,
+ 60000400,
+ 60000410,
+ 60000420,
+ 60000430,
+ 60000440,
+ 60000450,
+ 60000460,
+ 60000470,
+ 60000480,
+ 60000490,
+ 60000500,
+ 60000510,
+ 60000520,
+ 60000530,
+ 60000540,
+ 60000550,
+ 60000560,
+ 60000570,
+ 60000580,
+ 60000590,
+ 60000600
],
"weight": 2500,
"reward": [
@@ -71,11 +128,30 @@
{
"taskgroup": 10040,
"taskdetail": [
- 60000240,
- 60000250,
- 60000260,
- 60000270,
- 60000280
+ 60000370,
+ 60000380,
+ 60000390,
+ 60000400,
+ 60000410,
+ 60000420,
+ 60000430,
+ 60000440,
+ 60000450,
+ 60000460,
+ 60000470,
+ 60000480,
+ 60000490,
+ 60000500,
+ 60000510,
+ 60000520,
+ 60000530,
+ 60000540,
+ 60000550,
+ 60000560,
+ 60000570,
+ 60000580,
+ 60000590,
+ 60000600
],
"weight": 2500,
"reward": [
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 81346c0df..72c11a79f 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -6076,7 +6076,7 @@
},
{
"id": 12070430,
- "refresh": 0,
+ "refresh": 12070431,
"rtype": 1,
"ctype": 1,
"notify": [],
@@ -6107,6 +6107,39 @@
"0"
]
},
+ {
+ "id": 12070431,
+ "refresh": 12070430,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_179",
+ "text": "退出或解散俱乐部"
+ },
+ "type": 253,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 110360,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [],
+ "filter2": [
+ "等级",
+ "0",
+ "0",
+ "0"
+ ]
+ },
{
"id": 12070440,
"refresh": 0,
diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json
index d23e5cd92..673c4dffd 100644
--- a/bin/json/game_dispatch_task.json
+++ b/bin/json/game_dispatch_task.json
@@ -2008,7 +2008,7 @@
],
"rewardex": [
{
- "a": "pand",
+ "a": "panda",
"t": "20011",
"n": 1
}
@@ -2064,7 +2064,7 @@
],
"rewardex": [
{
- "a": "pand",
+ "a": "panda",
"t": "20012",
"n": 1
}
@@ -2120,7 +2120,7 @@
],
"rewardex": [
{
- "a": "pand",
+ "a": "panda",
"t": "20013",
"n": 1
}
@@ -2176,7 +2176,7 @@
],
"rewardex": [
{
- "a": "pand",
+ "a": "panda",
"t": "20014",
"n": 1
}
@@ -2232,7 +2232,7 @@
],
"rewardex": [
{
- "a": "pand",
+ "a": "panda",
"t": "20015",
"n": 1
}
@@ -2288,7 +2288,7 @@
],
"rewardex": [
{
- "a": "pand",
+ "a": "panda",
"t": "20016",
"n": 1
}
@@ -2344,7 +2344,7 @@
],
"rewardex": [
{
- "a": "pand",
+ "a": "panda",
"t": "20017",
"n": 1
}
@@ -2400,7 +2400,7 @@
],
"rewardex": [
{
- "a": "pand",
+ "a": "panda",
"t": "20018",
"n": 1
}
@@ -2456,7 +2456,7 @@
],
"rewardex": [
{
- "a": "pand",
+ "a": "panda",
"t": "20019",
"n": 1
}
@@ -2512,7 +2512,7 @@
],
"rewardex": [
{
- "a": "pand",
+ "a": "panda",
"t": "20020",
"n": 1
}
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 0b369063d..3282d3044 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -772,8 +772,8 @@
"catchbugturn": 6,
"NewDrawcardAttempts_Nums": 30,
"stonehenge_guideStage": 88,
- "dialogueclickcd": 0.5,
- "story_waittime": 0.1,
+ "dialogueclickcd": 0.3,
+ "story_waittime": 0.5,
"story_waittime_gaptime": 1,
"sx_ranknum": 200,
"IntegralBoss_challenge_num": 9999,
diff --git a/bin/json/game_horoscope.json b/bin/json/game_horoscope.json
index 0460afb3b..bef26141d 100644
--- a/bin/json/game_horoscope.json
+++ b/bin/json/game_horoscope.json
@@ -2348,7 +2348,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2382,7 +2382,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2416,7 +2416,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2450,7 +2450,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2512,7 +2512,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2546,7 +2546,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2580,7 +2580,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2642,7 +2642,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2676,7 +2676,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2710,7 +2710,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2772,7 +2772,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2806,7 +2806,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2840,7 +2840,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2902,7 +2902,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2936,7 +2936,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -2998,7 +2998,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3032,7 +3032,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3094,7 +3094,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3128,7 +3128,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3190,7 +3190,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3224,7 +3224,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3258,7 +3258,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3320,7 +3320,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3354,7 +3354,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3388,7 +3388,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3450,7 +3450,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3484,7 +3484,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3518,7 +3518,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3580,7 +3580,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3614,7 +3614,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3676,7 +3676,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3710,7 +3710,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3772,7 +3772,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3806,7 +3806,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3868,7 +3868,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3902,7 +3902,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3936,7 +3936,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -3998,7 +3998,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4032,7 +4032,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4066,7 +4066,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4128,7 +4128,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4162,7 +4162,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4196,7 +4196,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4258,7 +4258,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4292,7 +4292,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4354,7 +4354,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4388,7 +4388,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4450,7 +4450,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4484,7 +4484,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4546,7 +4546,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4580,7 +4580,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
@@ -4614,7 +4614,7 @@
"cost_item": [
{
"a": "attr",
- "t": "starcoin",
+ "t": "puggsygm",
"n": 1
}
],
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 793624d15..e69fe98ec 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -1184,6 +1184,92 @@
"sale": [],
"gm": 0
},
+ {
+ "id": "10000042",
+ "name": {
+ "key": "item_item_name_10000042",
+ "text": "旅行币"
+ },
+ "usetype": 1,
+ "color": 4,
+ "bagtype": 0,
+ "index": 9,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [
+ 10036
+ ],
+ "use_skip": 10036,
+ "upper_limit": 999,
+ "img": "wp_icon_10023",
+ "intr": {
+ "key": "item_item_intr_10000042",
+ "text": "与驴同行玩法中用于召唤和刷新守护者的道具"
+ },
+ "describe": {
+ "key": "item_item_describe_10000042",
+ "text": "买买买！都可以买"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_10000042",
+ "text": "【驴子旅行很奇怪吗？】"
+ },
+ "sale": [],
+ "gm": 0
+ },
+ {
+ "id": "10000043",
+ "name": {
+ "key": "item_item_name_10000043",
+ "text": "旅行物资"
+ },
+ "usetype": 1,
+ "color": 4,
+ "bagtype": 0,
+ "index": 99,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [
+ 10036
+ ],
+ "use_skip": 10036,
+ "upper_limit": 2000,
+ "img": "item_10000041",
+ "intr": {
+ "key": "item_item_intr_10000043",
+ "text": "与驴同行玩法中用于养成的道具"
+ },
+ "describe": {
+ "key": "item_item_describe_10000043",
+ "text": "有点用，但不多"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_10000043",
+ "text": "【一路走一路捡！】"
+ },
+ "sale": [],
+ "gm": 0
+ },
{
"id": "11013001",
"name": {
@@ -15491,53 +15577,6 @@
"id": "17050003",
"name": {
"key": "item_item_name_17050003",
- "text": "5星感观之林自选箱"
- },
- "usetype": 4,
- "color": 5,
- "bagtype": 1,
- "index": 2,
- "special_type": 0,
- "hold": 0,
- "time": 0,
- "reddottype": 0,
- "effects": "effect_ui_bagwindow_2",
- "modelName": "",
- "box_id": 17050003,
- "synthetize_num": 0,
- "synthetize_deplete": [],
- "synthetize_get": [],
- "decompose_deplete": [],
- "decompose_get": [],
- "access": [],
- "use_skip": 0,
- "upper_limit": 0,
- "img": "item_17050003",
- "intr": {
- "key": "item_item_intr_17050003",
- "text": "开启后，可以从5星感观之林属性守护者中自选一名守护者。"
- },
- "describe": {
- "key": "item_item_describe_17050003",
- "text": "5星感观之林自选宝箱。"
- },
- "dialogue": {
- "key": "item_item_dialogue_17050003",
- "text": ""
- },
- "sale": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1000
- }
- ],
- "gm": 0
- },
- {
- "id": "17050004",
- "name": {
- "key": "item_item_name_17050004",
"text": "5星包容之水自选箱"
},
"usetype": 4,
@@ -15559,15 +15598,62 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_17050004",
+ "img": "item_17050003",
"intr": {
- "key": "item_item_intr_17050004",
+ "key": "item_item_intr_17050003",
"text": "开启后，可以从5星包容之水属性守护者中自选一名守护者。"
},
"describe": {
- "key": "item_item_describe_17050004",
+ "key": "item_item_describe_17050003",
"text": "5星包容之水自选宝箱。"
},
+ "dialogue": {
+ "key": "item_item_dialogue_17050003",
+ "text": ""
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "gm": 0
+ },
+ {
+ "id": "17050004",
+ "name": {
+ "key": "item_item_name_17050004",
+ "text": "5星感观之林自选箱"
+ },
+ "usetype": 4,
+ "color": 5,
+ "bagtype": 1,
+ "index": 2,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "effect_ui_bagwindow_2",
+ "modelName": "",
+ "box_id": 17050003,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 0,
+ "upper_limit": 0,
+ "img": "item_17050004",
+ "intr": {
+ "key": "item_item_intr_17050004",
+ "text": "开启后，可以从5星感观之林属性守护者中自选一名守护者。"
+ },
+ "describe": {
+ "key": "item_item_describe_17050004",
+ "text": "5星感观之林自选宝箱。"
+ },
"dialogue": {
"key": "item_item_dialogue_17050004",
"text": ""
diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json
index 3fa34603b..0178ec57a 100644
--- a/bin/json/game_navigation.json
+++ b/bin/json/game_navigation.json
@@ -297,7 +297,7 @@
"sceneicon": "ty_qp_my01",
"functionname": {
"key": "navigation_Sheet1_functionname_18",
- "text": "捉虫"
+ "text": "猎食大冒险"
},
"npcName": [
"功能入口-捉虫"
diff --git a/bin/json/game_puggsyevent.json b/bin/json/game_puggsyevent.json
index fa5b0142c..ca8b942cc 100644
--- a/bin/json/game_puggsyevent.json
+++ b/bin/json/game_puggsyevent.json
@@ -6,8 +6,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -19,8 +24,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -32,8 +42,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -41,13 +56,18 @@
{
"event": 1004,
"node_id": 1,
- "type": 3,
- "value": 810301,
+ "type": 2,
+ "value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -58,9 +78,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -71,9 +96,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -98,8 +128,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -111,8 +146,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -124,8 +164,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -133,13 +178,18 @@
{
"event": 2004,
"node_id": 2,
- "type": 3,
+ "type": 2,
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -150,9 +200,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -163,9 +218,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -190,8 +250,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -203,8 +268,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -216,8 +286,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -225,13 +300,18 @@
{
"event": 3004,
"node_id": 3,
- "type": 3,
+ "type": 2,
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -242,9 +322,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -255,9 +340,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -282,8 +372,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -295,8 +390,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -308,8 +408,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -317,13 +422,18 @@
{
"event": 4004,
"node_id": 4,
- "type": 3,
+ "type": 2,
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -334,9 +444,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -347,9 +462,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -374,8 +494,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -387,8 +512,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -400,8 +530,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -409,13 +544,18 @@
{
"event": 5004,
"node_id": 5,
- "type": 3,
+ "type": 2,
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -426,9 +566,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -439,9 +584,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -466,8 +616,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -479,8 +634,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -492,8 +652,13 @@
"value": 200520,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
+ "a": "item",
+ "t": "10000042",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000043",
"n": 1
}
]
@@ -501,13 +666,18 @@
{
"event": 6004,
"node_id": 6,
- "type": 3,
+ "type": 2,
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -518,9 +688,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
@@ -531,9 +706,14 @@
"value": 0,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 2
}
]
},
diff --git a/bin/json/game_puggsyrecruit.json b/bin/json/game_puggsyrecruit.json
index 41603c72c..08ec11ad6 100644
--- a/bin/json/game_puggsyrecruit.json
+++ b/bin/json/game_puggsyrecruit.json
@@ -3,9 +3,9 @@
"star": 3,
"need": [
{
- "a": "attr",
- "t": "diamond",
- "n": 300
+ "a": "item",
+ "t": "10000042",
+ "n": 1
}
]
},
@@ -13,9 +13,9 @@
"star": 4,
"need": [
{
- "a": "attr",
- "t": "diamond",
- "n": 300
+ "a": "item",
+ "t": "10000042",
+ "n": 2
}
]
},
@@ -23,9 +23,9 @@
"star": 5,
"need": [
{
- "a": "attr",
- "t": "diamond",
- "n": 300
+ "a": "item",
+ "t": "10000042",
+ "n": 3
}
]
}
diff --git a/bin/json/game_puggsyscore.json b/bin/json/game_puggsyscore.json
index 97f2a9e46..59b1bc49b 100644
--- a/bin/json/game_puggsyscore.json
+++ b/bin/json/game_puggsyscore.json
@@ -13,9 +13,14 @@
"rank_up": 49999,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 5
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 5
}
]
},
@@ -26,9 +31,14 @@
"rank_up": 79999,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 6
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 6
}
]
},
@@ -39,9 +49,14 @@
"rank_up": 99999,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 7
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 7
}
]
},
@@ -49,259 +64,17 @@
"id": 5,
"boss_id": 810301,
"rank_low": 100000,
- "rank_up": 149999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 6,
- "boss_id": 810301,
- "rank_low": 150000,
- "rank_up": 199999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 7,
- "boss_id": 810301,
- "rank_low": 200000,
- "rank_up": 249999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 8,
- "boss_id": 810301,
- "rank_low": 250000,
- "rank_up": 319999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 9,
- "boss_id": 810301,
- "rank_low": 320000,
- "rank_up": 399999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 10,
- "boss_id": 810301,
- "rank_low": 400000,
- "rank_up": 499999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 11,
- "boss_id": 810301,
- "rank_low": 500000,
- "rank_up": 599999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 12,
- "boss_id": 810301,
- "rank_low": 600000,
- "rank_up": 699999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 13,
- "boss_id": 810301,
- "rank_low": 700000,
- "rank_up": 999999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 14,
- "boss_id": 810301,
- "rank_low": 1000000,
- "rank_up": 1199999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 15,
- "boss_id": 810301,
- "rank_low": 1200000,
- "rank_up": 1599999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 16,
- "boss_id": 810301,
- "rank_low": 1600000,
- "rank_up": 3799999,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 17,
- "boss_id": 810301,
- "rank_low": 3800000,
"rank_up": -1,
"reward": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
- }
- ]
- },
- {
- "id": 18,
- "boss_id": 810302,
- "rank_low": 0,
- "rank_up": 0,
- "reward": [
+ "a": "item",
+ "t": "10000042",
+ "n": 10
+ },
{
- "a": "attr",
- "t": "starcoin",
- "n": 2
- }
- ]
- },
- {
- "id": 19,
- "boss_id": 810303,
- "rank_low": 1,
- "rank_up": 1,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 3
- }
- ]
- },
- {
- "id": 20,
- "boss_id": 810304,
- "rank_low": 2,
- "rank_up": 2,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 4
- }
- ]
- },
- {
- "id": 21,
- "boss_id": 810305,
- "rank_low": 3,
- "rank_up": 3,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 5
- }
- ]
- },
- {
- "id": 22,
- "boss_id": 810306,
- "rank_low": 4,
- "rank_up": 4,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 6
- }
- ]
- },
- {
- "id": 23,
- "boss_id": 810307,
- "rank_low": 5,
- "rank_up": 5,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 7
- }
- ]
- },
- {
- "id": 24,
- "boss_id": 810308,
- "rank_low": 6,
- "rank_up": 6,
- "reward": [
- {
- "a": "attr",
- "t": "starcoin",
- "n": 8
+ "a": "item",
+ "t": "10000043",
+ "n": 10
}
]
}
diff --git a/bin/json/game_puggsystar.json b/bin/json/game_puggsystar.json
index c00efedff..910c9532c 100644
--- a/bin/json/game_puggsystar.json
+++ b/bin/json/game_puggsystar.json
@@ -20,9 +20,14 @@
"value": 1000,
"drop": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 5
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 5
}
]
},
@@ -47,9 +52,14 @@
"value": 1000,
"drop": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 6
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 6
}
]
},
@@ -74,9 +84,14 @@
"value": 1000,
"drop": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 8
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 8
}
]
},
@@ -101,9 +116,14 @@
"value": 1000,
"drop": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 8
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 8
}
]
},
@@ -128,9 +148,14 @@
"value": 1000,
"drop": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 8
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 8
}
]
},
@@ -155,9 +180,14 @@
"value": 1000,
"drop": [
{
- "a": "attr",
- "t": "starcoin",
- "n": 1
+ "a": "item",
+ "t": "10000042",
+ "n": 10
+ },
+ {
+ "a": "item",
+ "t": "10000043",
+ "n": 10
}
]
}
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
index 7cda86564..991ce43c5 100644
--- a/bin/json/game_rdtasknpc.json
+++ b/bin/json/game_rdtasknpc.json
@@ -10613,7 +10613,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "跑环-连环-匹诺曹",
+ "跑环-烹饪-匹诺曹",
"901"
],
"event": [
@@ -10823,7 +10823,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "跑环-烹饪-格里斯特王子",
+ "氛围npc-格里森王子",
"901"
],
"event": [
@@ -11387,7 +11387,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "跑环-烹饪-格里斯特王子",
+ "氛围npc-格里森王子",
"901"
],
"event": [
diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json
index 59ddf072f..8743a182c 100644
--- a/bin/json/game_ruledesc.json
+++ b/bin/json/game_ruledesc.json
@@ -532,15 +532,15 @@
"id": 10031,
"title": {
"key": "ruledesc_ruledesc_title_31",
- "text": "炼金塔挑战说明"
+ "text": "修炼塔挑战说明"
},
"titlecontent": {
"key": "ruledesc_ruledesc_titlecontent_34",
- "text": "炼金塔挑战说明"
+ "text": "修炼塔挑战说明"
},
"content": {
"key": "ruledesc_ruledesc_content_34",
- "text": "这里可以挑战炼金塔，每次挑战胜利都可以获得奖励，每挑战胜利10层可以获得相应教习。（炼金塔挑战不需要消耗物品）。"
+ "text": "这里可以挑战修炼塔，每次挑战胜利都可以获得奖励，每挑战胜利10层可以获得相应教习。（修炼塔挑战不需要消耗物品）。"
}
},
{
@@ -548,15 +548,15 @@
"id": 10032,
"title": {
"key": "ruledesc_ruledesc_title_32",
- "text": "炼金塔挑战说明"
+ "text": "修炼塔挑战说明"
},
"titlecontent": {
"key": "ruledesc_ruledesc_titlecontent_35",
- "text": "炼金塔挑战说明"
+ "text": "修炼塔挑战说明"
},
"content": {
"key": "ruledesc_ruledesc_content_35",
- "text": "这里可以查看炼金塔每层挑战成功获得的奖励与敌人配置。"
+ "text": "这里可以查看修炼塔每层挑战成功获得的奖励与敌人配置。"
}
},
{
@@ -904,11 +904,43 @@
},
"titlecontent": {
"key": "ruledesc_ruledesc_titlecontent_57",
- "text": ""
+ "text": "成就说明"
},
"content": {
"key": "ruledesc_ruledesc_content_57",
"text": "这里能查看所有获得的成就。"
}
+ },
+ {
+ "key": 58,
+ "id": 10049,
+ "title": {
+ "key": "ruledesc_ruledesc_title_50",
+ "text": "塔岗监狱说明"
+ },
+ "titlecontent": {
+ "key": "ruledesc_ruledesc_titlecontent_58",
+ "text": "塔岗监狱说明"
+ },
+ "content": {
+ "key": "ruledesc_ruledesc_content_22",
+ "text": "这里可以挑战泰坦们获得打造材料。
泰坦共有三种，挑战不同的泰坦都会有不同类别的装备打造材料。
挑战高难度泰坦获得的材料奖励越多。"
+ }
+ },
+ {
+ "key": 59,
+ "id": 10050,
+ "title": {
+ "key": "ruledesc_ruledesc_title_51",
+ "text": "猎魂挑战说明"
+ },
+ "titlecontent": {
+ "key": "ruledesc_ruledesc_titlecontent_59",
+ "text": "猎魂挑战说明"
+ },
+ "content": {
+ "key": "ruledesc_ruledesc_content_22",
+ "text": "这里可以挑战泰坦们获得打造材料。
泰坦共有三种，挑战不同的泰坦都会有不同类别的装备打造材料。
挑战高难度泰坦获得的材料奖励越多。"
+ }
}
]
\ No newline at end of file
diff --git a/bin/json/game_worldrd.json b/bin/json/game_worldrd.json
index bb39c5009..d8bb396a4 100644
--- a/bin/json/game_worldrd.json
+++ b/bin/json/game_worldrd.json
@@ -6,6 +6,11 @@
"key": "eventname_1",
"text": "无事发生"
},
+ "txt": {
+ "key": "world_rd_txt_01",
+ "text": "无事发生"
+ },
+ "img": "",
"eventweight": 40000,
"eventtype": 2,
"battleready": 126,
@@ -19,6 +24,11 @@
"key": "eventname_2",
"text": "打怪"
},
+ "txt": {
+ "key": "world_rd_txt_02",
+ "text": "打怪"
+ },
+ "img": "",
"eventweight": 30000,
"eventtype": 2,
"battleready": 126,
@@ -32,6 +42,11 @@
"key": "eventname_3",
"text": "获取金币"
},
+ "txt": {
+ "key": "world_rd_txt_03",
+ "text": "获取金币"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -45,6 +60,11 @@
"key": "eventname_4",
"text": "获取金币"
},
+ "txt": {
+ "key": "world_rd_txt_04",
+ "text": "获取金币"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -58,6 +78,11 @@
"key": "eventname_5",
"text": "获取金币"
},
+ "txt": {
+ "key": "world_rd_txt_05",
+ "text": "获取金币"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -71,6 +96,11 @@
"key": "eventname_6",
"text": "无事发生"
},
+ "txt": {
+ "key": "world_rd_txt_06",
+ "text": "无事发生"
+ },
+ "img": "",
"eventweight": 40000,
"eventtype": 2,
"battleready": 126,
@@ -84,6 +114,11 @@
"key": "eventname_7",
"text": "打怪"
},
+ "txt": {
+ "key": "world_rd_txt_07",
+ "text": "打怪"
+ },
+ "img": "",
"eventweight": 30000,
"eventtype": 2,
"battleready": 126,
@@ -97,6 +132,11 @@
"key": "eventname_10",
"text": "获取金币"
},
+ "txt": {
+ "key": "world_rd_txt_08",
+ "text": "获取金币"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -110,6 +150,11 @@
"key": "eventname_11",
"text": "获取金币"
},
+ "txt": {
+ "key": "world_rd_txt_09",
+ "text": "获取金币"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -123,6 +168,11 @@
"key": "eventname_12",
"text": "无事发生"
},
+ "txt": {
+ "key": "world_rd_txt_10",
+ "text": "无事发生"
+ },
+ "img": "",
"eventweight": 40000,
"eventtype": 2,
"battleready": 126,
@@ -136,6 +186,11 @@
"key": "eventname_13",
"text": "打怪"
},
+ "txt": {
+ "key": "world_rd_txt_11",
+ "text": "打怪"
+ },
+ "img": "",
"eventweight": 30000,
"eventtype": 2,
"battleready": 126,
@@ -149,6 +204,11 @@
"key": "eventname_14",
"text": "获取金币"
},
+ "txt": {
+ "key": "world_rd_txt_12",
+ "text": "获取金币"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -162,6 +222,11 @@
"key": "eventname_15",
"text": "获取金币"
},
+ "txt": {
+ "key": "world_rd_txt_13",
+ "text": "获取金币"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -175,6 +240,11 @@
"key": "eventname_16",
"text": "获取金币"
},
+ "txt": {
+ "key": "world_rd_txt_14",
+ "text": "获取金币"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -188,6 +258,11 @@
"key": "eventname_17",
"text": "炸药碎片"
},
+ "txt": {
+ "key": "world_rd_txt_15",
+ "text": "炸药碎片"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -201,6 +276,11 @@
"key": "eventname_18",
"text": "残余的臭屁"
},
+ "txt": {
+ "key": "world_rd_txt_16",
+ "text": "残余的臭屁"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -214,6 +294,11 @@
"key": "eventname_19",
"text": "熊猫的脚印"
},
+ "txt": {
+ "key": "world_rd_txt_17",
+ "text": "熊猫的脚印"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
@@ -227,6 +312,11 @@
"key": "eventname_20",
"text": "残余的冰魔法"
},
+ "txt": {
+ "key": "world_rd_txt_18",
+ "text": "残余的冰魔法"
+ },
+ "img": "",
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
diff --git a/sys/configure/structs/Game.WorldRdData.go b/sys/configure/structs/Game.WorldRdData.go
index e95f5c0b8..7585d0ddd 100644
--- a/sys/configure/structs/Game.WorldRdData.go
+++ b/sys/configure/structs/Game.WorldRdData.go
@@ -14,6 +14,8 @@ type GameWorldRdData struct {
Id int32
Group int32
Eventname string
+ Txt string
+ Img string
Eventweight int32
Eventtype int32
Battleready int32
@@ -31,6 +33,8 @@ func (_v *GameWorldRdData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["eventname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Eventname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Eventname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventweight"].(float64); !_ok_ { err = errors.New("eventweight error"); return }; _v.Eventweight = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventtype"].(float64); !_ok_ { err = errors.New("eventtype error"); return }; _v.Eventtype = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["battleready"].(float64); !_ok_ { err = errors.New("battleready error"); return }; _v.Battleready = int32(_tempNum_) }
diff --git a/sys/configure/structs/TEnum.HoroscopeType.go b/sys/configure/structs/TEnum.HoroscopeType.go
new file mode 100644
index 000000000..4253d46c5
--- /dev/null
+++ b/sys/configure/structs/TEnum.HoroscopeType.go
@@ -0,0 +1,14 @@
+//------------------------------------------------------------------------------
+//
+// 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
+
+const (
+ TEnumHoroscopeType_Horoscope = 1
+ TEnumHoroscopeType_IslandHoroscope = 2
+)
From 8495f8ba013b0603e849357c5098a60537bb0f83 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 21 Feb 2024 17:33:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E9=98=B2?=
=?UTF-8?q?=E5=AE=88=E9=98=B5=E5=AE=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/arena/api_info.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go
index db8af15ee..684aea6f1 100644
--- a/modules/arena/api_info.go
+++ b/modules/arena/api_info.go
@@ -94,7 +94,9 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
)
ids = make([]string, len(info.Defend.Formt))
for i, v := range info.Defend.Formt {
- ids[i] = v.Id
+ if v != nil {
+ ids[i] = v.Id
+ }
}
if heros, err = this.module.modelArena.queryUserHeros(session.GetUserId(), ids); err != nil {
errdata = &pb.ErrorData{
From d4d612aef8e41a92370bb6b59dfd620d1d7c8d0f Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 21 Feb 2024 17:53:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E7=AD=89=E7=BA=A7?=
=?UTF-8?q?=E8=8B=B1=E9=9B=84=20=E6=9E=84=E5=BB=BA=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=8C=96=E5=B1=9E=E6=80=A7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/island/api_buy.go | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/modules/island/api_buy.go b/modules/island/api_buy.go
index 784834261..8366eea1d 100644
--- a/modules/island/api_buy.go
+++ b/modules/island/api_buy.go
@@ -100,14 +100,17 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.IsLandBuyReq) (errda
}
if hero == nil {
hero = &pb.DBHero{
- Id: primitive.NewObjectID().Hex(),
- Uid: session.GetUserId(),
- HeroID: conf.Hid,
- Star: conf.Star,
- Lv: conf.Star * 10,
- Property: make(map[int32]int32),
- AddProperty: make(map[int32]int32),
- JuexProperty: make(map[int32]int32),
+ Id: primitive.NewObjectID().Hex(),
+ Uid: session.GetUserId(),
+ HeroID: conf.Hid,
+ Star: conf.Star,
+ Lv: conf.Star * 10,
+ Property: make(map[int32]int32),
+ AddProperty: make(map[int32]int32),
+ JuexProperty: make(map[int32]int32),
+ TalentProperty: make(map[int32]int32),
+ HoroscopeProperty: make(map[int32]int32),
+ Fetters: make(map[int32]int32),
}
this.module.hero.GetVirtualHero(hero, hero.Lv)
this.module.modelhero.addheros(session.GetUserId(), hero)