From 580419709022247ab86d235bd7afb500f57e0648 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 11 Aug 2023 20:42:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=98=E5=A2=83=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_activityshow.json | 57 ++++++++
bin/json/game_buriedcondi.json | 38 +++--
bin/json/game_hero.json | 56 ++++----
bin/json/game_mainstage.json | 20 ++-
bin/json/game_monsterformat.json | 58 ++++----
bin/json/game_opencond.json | 4 -
bin/json/game_stoneroom.json | 132 +++++++++---------
bin/json/game_stonetalent.json | 22 +--
modules/stonehenge/api_enterlevel.go | 35 ++---
modules/stonehenge/module.go | 3 +
sys/configure/structs/Game.Activityshow.go | 42 ++++++
.../structs/Game.ActivityshowData.go | 50 +++++++
sys/configure/structs/Game.BuffType.go | 5 +
sys/configure/structs/Tables.go | 7 +
14 files changed, 347 insertions(+), 182 deletions(-)
create mode 100644 bin/json/game_activityshow.json
create mode 100644 sys/configure/structs/Game.Activityshow.go
create mode 100644 sys/configure/structs/Game.ActivityshowData.go
diff --git a/bin/json/game_activityshow.json b/bin/json/game_activityshow.json
new file mode 100644
index 000000000..38f38b29e
--- /dev/null
+++ b/bin/json/game_activityshow.json
@@ -0,0 +1,57 @@
+[
+ {
+ "key": 0,
+ "show": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "key": 1001,
+ "show": [
+ {
+ "a": "item",
+ "t": "23000001",
+ "n": 0
+ }
+ ]
+ },
+ {
+ "key": 1003,
+ "show": [
+ {
+ "a": "item",
+ "t": "23000002",
+ "n": 0
+ }
+ ]
+ },
+ {
+ "key": 1004,
+ "show": [
+ {
+ "a": "item",
+ "t": "23000003",
+ "n": 0
+ }
+ ]
+ },
+ {
+ "key": 1005,
+ "show": [
+ {
+ "a": "item",
+ "t": "23000004",
+ "n": 0
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index fae9983d8..3e2db50ac 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -177,7 +177,9 @@
"id": 107,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "smithy"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_7",
@@ -204,7 +206,9 @@
"id": 108,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "smithy"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_8",
@@ -231,7 +235,9 @@
"id": 109,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "smithy"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_9",
@@ -258,7 +264,9 @@
"id": 110,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "smithy"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_10",
@@ -285,7 +293,9 @@
"id": 111,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "smithy"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_11",
@@ -312,7 +322,9 @@
"id": 112,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "smithy"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_12",
@@ -339,7 +351,9 @@
"id": 113,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "smithy"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_13",
@@ -366,7 +380,9 @@
"id": 114,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "smithy"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_14",
@@ -393,7 +409,9 @@
"id": 115,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "smithy"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_15",
@@ -20837,7 +20855,7 @@
"NPC": -102,
"value": 5,
"filter": [
- 44004
+ 24004
],
"filter2": [
"守护者ID",
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 27185dcf2..1026162cb 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -5331,7 +5331,7 @@
"hid": "51002",
"name": {
"key": "hero_main_name_51002",
- "text": "埃雷特手下1号"
+ "text": "大胡子村民"
},
"star": 3,
"color": 2,
@@ -5405,7 +5405,7 @@
"hid": "51003",
"name": {
"key": "hero_main_name_51003",
- "text": "埃雷特手下2号"
+ "text": "蓝帽子村民"
},
"star": 3,
"color": 2,
@@ -5627,7 +5627,7 @@
"hid": "51006",
"name": {
"key": "hero_main_name_51006",
- "text": "羊群"
+ "text": "羊"
},
"star": 3,
"color": 2,
@@ -5849,7 +5849,7 @@
"hid": "51010",
"name": {
"key": "hero_main_name_51010",
- "text": "警卫1号"
+ "text": "瘦高的警卫"
},
"star": 3,
"color": 2,
@@ -5923,7 +5923,7 @@
"hid": "51011",
"name": {
"key": "hero_main_name_51011",
- "text": "警卫2号"
+ "text": "强壮的警卫"
},
"star": 3,
"color": 2,
@@ -10439,7 +10439,7 @@
"hid": "51050",
"name": {
"key": "hero_main_name_51050",
- "text": "小蜘蛛A"
+ "text": "恐惧小蜘蛛"
},
"star": 3,
"color": 2,
@@ -10587,7 +10587,7 @@
"hid": "51052",
"name": {
"key": "hero_main_name_51052",
- "text": "小蜘蛛B"
+ "text": "恐怖小蜘蛛"
},
"star": 3,
"color": 2,
@@ -10883,7 +10883,7 @@
"hid": "51100",
"name": {
"key": "hero_main_name_51100",
- "text": "埃雷特手下1号"
+ "text": "大胡子村民"
},
"star": 3,
"color": 2,
@@ -10957,7 +10957,7 @@
"hid": "51101",
"name": {
"key": "hero_main_name_51101",
- "text": "埃雷特手下2号"
+ "text": "蓝帽子村民"
},
"star": 3,
"color": 2,
@@ -11179,7 +11179,7 @@
"hid": "51104",
"name": {
"key": "hero_main_name_51104",
- "text": "羊群"
+ "text": "羊"
},
"star": 3,
"color": 2,
@@ -11253,7 +11253,7 @@
"hid": "51105",
"name": {
"key": "hero_main_name_51105",
- "text": "警卫1号"
+ "text": "瘦高的警卫"
},
"star": 3,
"color": 2,
@@ -11327,7 +11327,7 @@
"hid": "51106",
"name": {
"key": "hero_main_name_51106",
- "text": "警卫2号"
+ "text": "强壮的警卫"
},
"star": 3,
"color": 2,
@@ -11697,7 +11697,7 @@
"hid": "51111",
"name": {
"key": "hero_main_name_51111",
- "text": "小蜘蛛A"
+ "text": "恐惧小蜘蛛"
},
"star": 3,
"color": 2,
@@ -11845,7 +11845,7 @@
"hid": "51113",
"name": {
"key": "hero_main_name_51113",
- "text": "小蜘蛛B"
+ "text": "恐怖小蜘蛛"
},
"star": 3,
"color": 2,
@@ -11993,7 +11993,7 @@
"hid": "51300",
"name": {
"key": "hero_main_name_51300",
- "text": "埃雷特手下1号"
+ "text": "大胡子村民"
},
"star": 3,
"color": 2,
@@ -12067,7 +12067,7 @@
"hid": "51301",
"name": {
"key": "hero_main_name_51301",
- "text": "埃雷特手下2号"
+ "text": "蓝帽子村民"
},
"star": 3,
"color": 2,
@@ -12289,7 +12289,7 @@
"hid": "51304",
"name": {
"key": "hero_main_name_51304",
- "text": "羊群"
+ "text": "羊"
},
"star": 3,
"color": 2,
@@ -12363,7 +12363,7 @@
"hid": "51305",
"name": {
"key": "hero_main_name_51305",
- "text": "警卫1号"
+ "text": "瘦高的警卫"
},
"star": 3,
"color": 2,
@@ -12437,7 +12437,7 @@
"hid": "51306",
"name": {
"key": "hero_main_name_51306",
- "text": "警卫2号"
+ "text": "强壮的警卫"
},
"star": 3,
"color": 2,
@@ -12807,7 +12807,7 @@
"hid": "51311",
"name": {
"key": "hero_main_name_51311",
- "text": "小蜘蛛A"
+ "text": "恐惧小蜘蛛"
},
"star": 3,
"color": 2,
@@ -12955,7 +12955,7 @@
"hid": "51313",
"name": {
"key": "hero_main_name_51313",
- "text": "小蜘蛛B"
+ "text": "恐怖小蜘蛛"
},
"star": 3,
"color": 2,
@@ -13103,7 +13103,7 @@
"hid": "51500",
"name": {
"key": "hero_main_name_51500",
- "text": "埃雷特手下1号"
+ "text": "大胡子村民"
},
"star": 3,
"color": 2,
@@ -13177,7 +13177,7 @@
"hid": "51501",
"name": {
"key": "hero_main_name_51501",
- "text": "埃雷特手下2号"
+ "text": "蓝帽子村民"
},
"star": 3,
"color": 2,
@@ -13399,7 +13399,7 @@
"hid": "51504",
"name": {
"key": "hero_main_name_51504",
- "text": "羊群"
+ "text": "羊"
},
"star": 3,
"color": 2,
@@ -13473,7 +13473,7 @@
"hid": "51505",
"name": {
"key": "hero_main_name_51505",
- "text": "警卫1号"
+ "text": "瘦高的警卫"
},
"star": 3,
"color": 2,
@@ -13547,7 +13547,7 @@
"hid": "51506",
"name": {
"key": "hero_main_name_51506",
- "text": "警卫2号"
+ "text": "强壮的警卫"
},
"star": 3,
"color": 2,
@@ -13917,7 +13917,7 @@
"hid": "51511",
"name": {
"key": "hero_main_name_51511",
- "text": "小蜘蛛A"
+ "text": "恐惧小蜘蛛"
},
"star": 3,
"color": 2,
@@ -14065,7 +14065,7 @@
"hid": "51513",
"name": {
"key": "hero_main_name_51513",
- "text": "小蜘蛛B"
+ "text": "恐怖小蜘蛛"
},
"star": 3,
"color": 2,
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 0c51e4f56..0c0374926 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -675,13 +675,7 @@
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
- "firstaward": [
- {
- "a": "attr",
- "t": "gold",
- "n": 6000
- }
- ],
+ "firstaward": [],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,
@@ -897,7 +891,7 @@
"openlevel": 1,
"EditorStage": 0,
"venturemodel": "",
- "venturetype": 0,
+ "venturetype": 1,
"ventureavatar": [
"Person/13002/13002_q.prefab"
],
@@ -957,7 +951,7 @@
"openlevel": 1,
"EditorStage": 0,
"venturemodel": "",
- "venturetype": 0,
+ "venturetype": 1,
"ventureavatar": [
"Person/13002/13002_q.prefab"
],
@@ -1017,7 +1011,7 @@
"openlevel": 1,
"EditorStage": 0,
"venturemodel": "",
- "venturetype": 0,
+ "venturetype": 1,
"ventureavatar": [
"Person/13002/13002_q.prefab"
],
@@ -7013,8 +7007,10 @@
"openlevel": 1,
"EditorStage": 0,
"venturemodel": "",
- "venturetype": 0,
- "ventureavatar": [],
+ "venturetype": 1,
+ "ventureavatar": [
+ "Person/14002/14002_q.prefab"
+ ],
"herocolor": 0,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 88a4d26bd..f5051703c 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -305,7 +305,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51004,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -325,7 +325,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51005,
+ "heroid": 51014,
"star": 3,
"equip": [],
"newskill": [],
@@ -345,7 +345,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51004,
+ "heroid": 51014,
"star": 3,
"equip": [],
"newskill": [],
@@ -365,7 +365,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 53002,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -605,7 +605,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51004,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -625,7 +625,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51005,
+ "heroid": 51014,
"star": 3,
"equip": [],
"newskill": [],
@@ -645,7 +645,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51004,
+ "heroid": 51014,
"star": 3,
"equip": [],
"newskill": [],
@@ -665,7 +665,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 53002,
+ "heroid": 51014,
"star": 3,
"equip": [],
"newskill": [],
@@ -685,7 +685,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51014,
"star": 3,
"equip": [],
"newskill": [],
@@ -4205,7 +4205,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51010,
+ "heroid": 24004,
"star": 3,
"equip": [],
"newskill": [],
@@ -4225,7 +4225,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51011,
+ "heroid": 51052,
"star": 3,
"equip": [],
"newskill": [],
@@ -4245,7 +4245,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 34003,
+ "heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
@@ -4265,7 +4265,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 24004,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -4505,7 +4505,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51002,
+ "heroid": 24004,
"star": 3,
"equip": [],
"newskill": [],
@@ -4525,7 +4525,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51003,
+ "heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
@@ -4545,7 +4545,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 24002,
+ "heroid": 51052,
"star": 3,
"equip": [],
"newskill": [],
@@ -4565,7 +4565,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 24004,
+ "heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
@@ -4585,7 +4585,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51052,
"star": 3,
"equip": [],
"newskill": [],
@@ -232705,7 +232705,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51052,
"star": 3,
"equip": [],
"newskill": [],
@@ -232725,7 +232725,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51052,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -232745,7 +232745,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51050,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -232765,7 +232765,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51050,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -232785,7 +232785,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51052,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -232965,7 +232965,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51052,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -232985,7 +232985,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51052,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -233005,7 +233005,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51004,
+ "heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
@@ -233025,7 +233025,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51003,
+ "heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
@@ -233045,7 +233045,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51002,
+ "heroid": 51052,
"star": 3,
"equip": [],
"newskill": [],
@@ -233065,7 +233065,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 53001,
+ "heroid": 51052,
"star": 5,
"equip": [],
"newskill": [],
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 9472c40d8..64898fecd 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -2040,10 +2040,6 @@
{
"key": 1,
"param": 1
- },
- {
- "key": 2,
- "param": 1100808
}
],
"wkqbx": 2,
diff --git a/bin/json/game_stoneroom.json b/bin/json/game_stoneroom.json
index 2c6247acf..b9f0d424c 100644
--- a/bin/json/game_stoneroom.json
+++ b/bin/json/game_stoneroom.json
@@ -26,10 +26,10 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
- "EventStoryNpcGroup": 12100000,
- "EventTreasureGroup": 10000001,
- "EventStoreGroup": 11000000,
+ "EventBattleGroup": 14010100,
+ "EventStoryNpcGroup": 0,
+ "EventTreasureGroup": 0,
+ "EventStoreGroup": 0,
"BossEvent": 0,
"Condition": [
14
@@ -44,10 +44,10 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
- "EventStoryNpcGroup": 12100000,
- "EventTreasureGroup": 10000001,
- "EventStoreGroup": 11000000,
+ "EventBattleGroup": 14010100,
+ "EventStoryNpcGroup": 0,
+ "EventTreasureGroup": 0,
+ "EventStoreGroup": 0,
"BossEvent": 0,
"Condition": [
14
@@ -80,7 +80,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -132,7 +132,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -150,7 +150,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -186,7 +186,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -222,7 +222,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -240,7 +240,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -276,7 +276,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -328,7 +328,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -346,7 +346,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -382,7 +382,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -418,7 +418,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -436,7 +436,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -472,7 +472,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -524,7 +524,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -542,7 +542,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -578,7 +578,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -614,7 +614,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -632,7 +632,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -668,7 +668,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -720,7 +720,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -738,7 +738,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -774,7 +774,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -844,7 +844,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -862,7 +862,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -898,7 +898,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -934,7 +934,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -952,7 +952,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -988,7 +988,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1040,7 +1040,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1058,7 +1058,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1094,7 +1094,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1164,7 +1164,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1182,7 +1182,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1218,7 +1218,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1254,7 +1254,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1272,7 +1272,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1308,7 +1308,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1360,7 +1360,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1378,7 +1378,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1414,7 +1414,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1484,7 +1484,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1502,7 +1502,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1538,7 +1538,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1574,7 +1574,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1592,7 +1592,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1628,7 +1628,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1680,7 +1680,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1698,7 +1698,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1734,7 +1734,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1804,7 +1804,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1822,7 +1822,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1858,7 +1858,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1894,7 +1894,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1912,7 +1912,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -1948,7 +1948,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -2000,7 +2000,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -2018,7 +2018,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@@ -2054,7 +2054,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
- "EventBattleGroup": 14110100,
+ "EventBattleGroup": 14010100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
diff --git a/bin/json/game_stonetalent.json b/bin/json/game_stonetalent.json
index 252191a1a..e147de0a9 100644
--- a/bin/json/game_stonetalent.json
+++ b/bin/json/game_stonetalent.json
@@ -2,7 +2,7 @@
{
"Id": 1,
"NodeType": 2,
- "NodeIcon": "js_icon_sx9",
+ "NodeIcon": "mj_icon_attack",
"listIndex": 1,
"Front": [],
"CostItem": [
@@ -31,7 +31,7 @@
{
"Id": 2,
"NodeType": 1,
- "NodeIcon": "js_jx_img_icon01",
+ "NodeIcon": "mj_icon_life",
"listIndex": 1,
"Front": [
1
@@ -58,7 +58,7 @@
{
"Id": 3,
"NodeType": 1,
- "NodeIcon": "js_jx_img_icon03",
+ "NodeIcon": "mj_icon_life",
"listIndex": 1,
"Front": [
1
@@ -140,7 +140,7 @@
{
"Id": 6,
"NodeType": 1,
- "NodeIcon": "js_jx_img_icon01",
+ "NodeIcon": "Lifemj_icon_life",
"listIndex": 2,
"Front": [
5
@@ -167,7 +167,7 @@
{
"Id": 7,
"NodeType": 1,
- "NodeIcon": "js_jx_img_icon03",
+ "NodeIcon": "Lifemj_icon_life",
"listIndex": 2,
"Front": [
5
@@ -194,7 +194,7 @@
{
"Id": 8,
"NodeType": 2,
- "NodeIcon": "Life",
+ "NodeIcon": "Lifemj_icon_life",
"listIndex": 2,
"Front": [
6,
@@ -222,7 +222,7 @@
{
"Id": 9,
"NodeType": 1,
- "NodeIcon": "js_jx_img_icon05",
+ "NodeIcon": "Lifemj_icon_life",
"listIndex": 3,
"Front": [
8
@@ -249,7 +249,7 @@
{
"Id": 10,
"NodeType": 1,
- "NodeIcon": "js_jx_img_icon05",
+ "NodeIcon": "Lifemj_icon_life",
"listIndex": 3,
"Front": [
8
@@ -276,7 +276,7 @@
{
"Id": 11,
"NodeType": 1,
- "NodeIcon": "js_jx_img_icon05",
+ "NodeIcon": "Lifemj_icon_life",
"listIndex": 3,
"Front": [
9
@@ -303,7 +303,7 @@
{
"Id": 12,
"NodeType": 1,
- "NodeIcon": "js_jx_img_icon05",
+ "NodeIcon": "Lifemj_icon_life",
"listIndex": 3,
"Front": [
10
@@ -330,7 +330,7 @@
{
"Id": 13,
"NodeType": 2,
- "NodeIcon": "js_icon_sx7",
+ "NodeIcon": "Lifemj_icon_life",
"listIndex": 3,
"Front": [
11,
diff --git a/modules/stonehenge/api_enterlevel.go b/modules/stonehenge/api_enterlevel.go
index f5d7906d3..e7346768c 100644
--- a/modules/stonehenge/api_enterlevel.go
+++ b/modules/stonehenge/api_enterlevel.go
@@ -21,17 +21,16 @@ func (this *apiComp) EnterLevelCheck(session comm.IUserSession, req *pb.Stonehen
//进入关卡 选择英雄和buff 一起处理
func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnterLevelReq) (errdata *pb.ErrorData) {
var (
- stone *pb.DBStonehenge
- update map[string]interface{}
- heros []*pb.DBHero
- portal int32 // 生成传送门 构造房间数据
- confStage *cfg.GameStoneStageData
- roomlotteryConf *cfg.GameRoomlotteryData
- curRoomConf *cfg.GameStoneRoomData // 当前房间
- szBuff []int32
- err error
- szEvent []int32
- roles []*pb.BattleRole
+ stone *pb.DBStonehenge
+ update map[string]interface{}
+ heros []*pb.DBHero
+ portal int32 // 生成传送门 构造房间数据
+ confStage *cfg.GameStoneStageData
+ curRoomConf *cfg.GameStoneRoomData // 当前房间
+ szBuff []int32
+ err error
+ szEvent []int32
+ roles []*pb.BattleRole
)
update = make(map[string]interface{})
if errdata = this.EnterLevelCheck(session, req); errdata != nil {
@@ -89,16 +88,8 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt
update["hero"] = stone.Hero
stone.Addweight[req.BuffType] = 1
update["addweight"] = stone.Addweight
- // 生成传送门
- if roomlotteryConf = this.module.configure.GetRoomLotterConfById(portal); roomlotteryConf != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: fmt.Sprintf("GetRoomLotterConfById :%d", portal),
- }
- return
- }
- if r := this.module.configure.GetRoomGroupDataByLottery(confStage.PortalGroup); len(r) > 0 {
+
+ if r := this.module.configure.GetRoomGroupDataByLottery(portal); len(r) > 0 {
if curRoomConf, err = this.module.configure.GetStoneRoomDataById(r[0]); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
@@ -111,7 +102,7 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: fmt.Sprintf("GetRoomGroupDataByLottery :%d", confStage.PortalGroup),
+ Message: fmt.Sprintf("GetRoomGroupDataByLottery :%d", portal),
}
return
}
diff --git a/modules/stonehenge/module.go b/modules/stonehenge/module.go
index c05e5f5dc..ea1ff749e 100644
--- a/modules/stonehenge/module.go
+++ b/modules/stonehenge/module.go
@@ -71,8 +71,11 @@ func (this *Stonehenge) GmAddStoneEvent(uid string, eventid int32) {
if stone.Rooms != nil {
stone.Rooms.Eventid[eventid] = false
update := make(map[string]interface{})
+
+ this.modelStonehenge.AddNewEvent([]int32{eventid}, stone)
update["rooms"] = stone.Rooms
this.modelStonehenge.ChangeStonehengeData(uid, update)
+
}
return
diff --git a/sys/configure/structs/Game.Activityshow.go b/sys/configure/structs/Game.Activityshow.go
new file mode 100644
index 000000000..2df201fa5
--- /dev/null
+++ b/sys/configure/structs/Game.Activityshow.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 GameActivityshow struct {
+ _dataMap map[int32]*GameActivityshowData
+ _dataList []*GameActivityshowData
+}
+
+func NewGameActivityshow(_buf []map[string]interface{}) (*GameActivityshow, error) {
+ _dataList := make([]*GameActivityshowData, 0, len(_buf))
+ dataMap := make(map[int32]*GameActivityshowData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameActivityshowData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Key] = _v
+ }
+ }
+ return &GameActivityshow{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameActivityshow) GetDataMap() map[int32]*GameActivityshowData {
+ return table._dataMap
+}
+
+func (table *GameActivityshow) GetDataList() []*GameActivityshowData {
+ return table._dataList
+}
+
+func (table *GameActivityshow) Get(key int32) *GameActivityshowData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.ActivityshowData.go b/sys/configure/structs/Game.ActivityshowData.go
new file mode 100644
index 000000000..96fe359a3
--- /dev/null
+++ b/sys/configure/structs/Game.ActivityshowData.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 GameActivityshowData struct {
+ Key int32
+ Show []*Gameatn
+}
+
+const TypeId_GameActivityshowData = 1637104338
+
+func (*GameActivityshowData) GetTypeId() int32 {
+ return 1637104338
+}
+
+func (_v *GameActivityshowData)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 _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["show"].([]interface{}); !_ok_ { err = errors.New("show error"); return }
+
+ _v.Show = 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.Show = append(_v.Show, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameActivityshowData(_buf map[string]interface{}) (*GameActivityshowData, error) {
+ v := &GameActivityshowData{}
+ 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 375dea00a..a18cee9b6 100644
--- a/sys/configure/structs/Game.BuffType.go
+++ b/sys/configure/structs/Game.BuffType.go
@@ -102,4 +102,9 @@ const (
GameBuffType_LOST_SHIELD_EXTRA_DMG = 109
GameBuffType_AOE_DMG = 110
GameBuffType_AVERAGE_DMG = 111
+ GameBuffType_CAMP_RESTRAIN = 112
+ GameBuffType_SKY_CHOSEN = 113
+ GameBuffType_FIGHT_VOLITION = 114
+ GameBuffType_WEAKENS = 115
+ GameBuffType_CONCEAL = 116
)
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 96041805c..aa9b909b1 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -246,6 +246,7 @@ type Tables struct {
UiGameMiner *GameUiGameMiner
PushGift *GamePushGift
UiGameConsum *GameUiGameConsum
+ Activityshow *GameActivityshow
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1663,5 +1664,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.UiGameConsum, err = NewGameUiGameConsum(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_activityshow") ; err != nil {
+ return nil, err
+ }
+ if tables.Activityshow, err = NewGameActivityshow(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
From f96a70a98df81df41f6558b4723f2723f3dce47d Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 11 Aug 2023 20:44:40 +0800
Subject: [PATCH 2/2] =?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_activityshow.json | 63 ++++---
bin/json/game_battleready.json | 156 ++++++++++++++++++
bin/json/game_monsterformat.json | 12 +-
bin/json/game_stonebattle.json | 12 +-
sys/configure/structs/Game.BattleReadyData.go | 2 +
5 files changed, 213 insertions(+), 32 deletions(-)
diff --git a/bin/json/game_activityshow.json b/bin/json/game_activityshow.json
index fdd2cbceb..38f38b29e 100644
--- a/bin/json/game_activityshow.json
+++ b/bin/json/game_activityshow.json
@@ -1,34 +1,57 @@
[
+ {
+ "key": 0,
+ "show": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1
+ }
+ ]
+ },
{
"key": 1001,
- "show": {
- "a": "item",
- "t": "23000001",
- "n": 0
- }
+ "show": [
+ {
+ "a": "item",
+ "t": "23000001",
+ "n": 0
+ }
+ ]
},
{
"key": 1003,
- "show": {
- "a": "item",
- "t": "23000002",
- "n": 0
- }
+ "show": [
+ {
+ "a": "item",
+ "t": "23000002",
+ "n": 0
+ }
+ ]
},
{
"key": 1004,
- "show": {
- "a": "item",
- "t": "23000003",
- "n": 0
- }
+ "show": [
+ {
+ "a": "item",
+ "t": "23000003",
+ "n": 0
+ }
+ ]
},
{
"key": 1005,
- "show": {
- "a": "item",
- "t": "23000004",
- "n": 0
- }
+ "show": [
+ {
+ "a": "item",
+ "t": "23000004",
+ "n": 0
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index ac32c085c..e793543b5 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -9,6 +9,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -33,6 +37,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -57,6 +65,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -81,6 +93,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -105,6 +121,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -129,6 +149,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -153,6 +177,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -177,6 +205,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -201,6 +233,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -225,6 +261,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -249,6 +289,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -273,6 +317,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -297,6 +345,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -321,6 +373,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -345,6 +401,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -369,6 +429,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -393,6 +457,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -417,6 +485,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -441,6 +513,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -465,6 +541,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -489,6 +569,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -513,6 +597,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -537,6 +625,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -561,6 +653,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -585,6 +681,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 1,
@@ -609,6 +709,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 1,
@@ -633,6 +737,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -657,6 +765,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -681,6 +793,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 1,
@@ -705,6 +821,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -729,6 +849,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -755,6 +879,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -781,6 +909,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -807,6 +939,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -831,6 +967,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -855,6 +995,10 @@
],
"HideAlienSpace": 0,
"ShowBuff": 1,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [
14
],
@@ -881,6 +1025,10 @@
],
"HideAlienSpace": 1,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -907,6 +1055,10 @@
],
"HideAlienSpace": 1,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
@@ -936,6 +1088,10 @@
],
"HideAlienSpace": 1,
"ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index f5051703c..774f5b891 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -325,7 +325,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51014,
+ "heroid": 51004,
"star": 3,
"equip": [],
"newskill": [],
@@ -345,7 +345,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51014,
+ "heroid": 51004,
"star": 3,
"equip": [],
"newskill": [],
@@ -625,7 +625,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51014,
+ "heroid": 51004,
"star": 3,
"equip": [],
"newskill": [],
@@ -645,7 +645,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51014,
+ "heroid": 51004,
"star": 3,
"equip": [],
"newskill": [],
@@ -665,7 +665,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51014,
+ "heroid": 51004,
"star": 3,
"equip": [],
"newskill": [],
@@ -685,7 +685,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51014,
+ "heroid": 51004,
"star": 3,
"equip": [],
"newskill": [],
diff --git a/bin/json/game_stonebattle.json b/bin/json/game_stonebattle.json
index 5247a3522..e6b1fbe4e 100644
--- a/bin/json/game_stonebattle.json
+++ b/bin/json/game_stonebattle.json
@@ -9,7 +9,7 @@
"EffreValue": 0,
"BattleReadyID": 118,
"FormatList": [
- 101011
+ 500101
],
"RewardLottery": 21141101
},
@@ -23,7 +23,7 @@
"EffreValue": 0,
"BattleReadyID": 118,
"FormatList": [
- 101012
+ 500201
],
"RewardLottery": 21141101
},
@@ -37,7 +37,7 @@
"EffreValue": 0,
"BattleReadyID": 118,
"FormatList": [
- 101013
+ 500301
],
"RewardLottery": 21141101
},
@@ -51,7 +51,7 @@
"EffreValue": 0,
"BattleReadyID": 118,
"FormatList": [
- 101021
+ 500401
],
"RewardLottery": 21141101
},
@@ -65,7 +65,7 @@
"EffreValue": 0,
"BattleReadyID": 118,
"FormatList": [
- 101051
+ 500601
],
"RewardLottery": 21141101
},
@@ -79,7 +79,7 @@
"EffreValue": 0,
"BattleReadyID": 118,
"FormatList": [
- 101061
+ 500701
],
"RewardLottery": 21141101
}
diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go
index f912b0ea8..5ceef83ec 100644
--- a/sys/configure/structs/Game.BattleReadyData.go
+++ b/sys/configure/structs/Game.BattleReadyData.go
@@ -18,6 +18,7 @@ type GameBattleReadyData struct {
BattleScenes []string
HideAlienSpace int32
ShowBuff int32
+ RuleTips string
BattleEvents []int32
ScoreGroupID int32
DisableAiCamera int32
@@ -60,6 +61,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideAlienSpace"].(float64); !_ok_ { err = errors.New("HideAlienSpace error"); return }; _v.HideAlienSpace = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ShowBuff"].(float64); !_ok_ { err = errors.New("ShowBuff error"); return }; _v.ShowBuff = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["RuleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RuleTips error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RuleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
var _arr_ []interface{}
var _ok_ bool