liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei 2023-08-11 17:50:39 +08:00
commit cca5f100db
6 changed files with 159 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/json/game_stoneevent.json
View File

@ -1,4 +1,20 @@
[
{
"EventId": 29000000,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_1",
"text": "强化buff"
},
"EventType": 29,
"EventResource": "",
"Value1": 0,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
{
"EventId": 10000001,
"EventTitle": {

236
bin/json/game_stoneroom.json
View File

@ -23,7 +23,7 @@
"key": "stonehenge_roomconfig_RoomName_2",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -41,7 +41,7 @@
"key": "stonehenge_roomconfig_RoomName_3",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -59,7 +59,7 @@
"key": "stonehenge_roomconfig_RoomName_4",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -77,7 +77,7 @@
"key": "stonehenge_roomconfig_RoomName_5",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -95,7 +95,7 @@
"key": "stonehenge_roomconfig_RoomName_6",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -111,7 +111,7 @@
"key": "stonehenge_roomconfig_RoomName_7",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_02",
"SceneName": "StonehengeScene2",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 0,
@ -129,7 +129,7 @@
"key": "stonehenge_roomconfig_RoomName_8",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -147,7 +147,7 @@
"key": "stonehenge_roomconfig_RoomName_9",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -165,7 +165,7 @@
"key": "stonehenge_roomconfig_RoomName_10",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -183,7 +183,7 @@
"key": "stonehenge_roomconfig_RoomName_11",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -201,7 +201,7 @@
"key": "stonehenge_roomconfig_RoomName_12",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -219,7 +219,7 @@
"key": "stonehenge_roomconfig_RoomName_13",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -237,7 +237,7 @@
"key": "stonehenge_roomconfig_RoomName_14",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -255,7 +255,7 @@
"key": "stonehenge_roomconfig_RoomName_15",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -273,7 +273,7 @@
"key": "stonehenge_roomconfig_RoomName_16",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -291,7 +291,7 @@
"key": "stonehenge_roomconfig_RoomName_17",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -307,7 +307,7 @@
"key": "stonehenge_roomconfig_RoomName_18",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_02",
"SceneName": "StonehengeScene2",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 0,
@ -325,7 +325,7 @@
"key": "stonehenge_roomconfig_RoomName_19",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -343,7 +343,7 @@
"key": "stonehenge_roomconfig_RoomName_20",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -361,7 +361,7 @@
"key": "stonehenge_roomconfig_RoomName_21",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -379,7 +379,7 @@
"key": "stonehenge_roomconfig_RoomName_22",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -397,7 +397,7 @@
"key": "stonehenge_roomconfig_RoomName_23",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -415,7 +415,7 @@
"key": "stonehenge_roomconfig_RoomName_24",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -433,7 +433,7 @@
"key": "stonehenge_roomconfig_RoomName_25",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -451,7 +451,7 @@
"key": "stonehenge_roomconfig_RoomName_26",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -469,7 +469,7 @@
"key": "stonehenge_roomconfig_RoomName_27",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -487,7 +487,7 @@
"key": "stonehenge_roomconfig_RoomName_28",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -503,7 +503,7 @@
"key": "stonehenge_roomconfig_RoomName_29",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_02",
"SceneName": "StonehengeScene2",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 0,
@ -521,7 +521,7 @@
"key": "stonehenge_roomconfig_RoomName_30",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -539,7 +539,7 @@
"key": "stonehenge_roomconfig_RoomName_31",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -557,7 +557,7 @@
"key": "stonehenge_roomconfig_RoomName_32",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -575,7 +575,7 @@
"key": "stonehenge_roomconfig_RoomName_33",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -593,7 +593,7 @@
"key": "stonehenge_roomconfig_RoomName_34",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -611,7 +611,7 @@
"key": "stonehenge_roomconfig_RoomName_35",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -629,7 +629,7 @@
"key": "stonehenge_roomconfig_RoomName_36",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -647,7 +647,7 @@
"key": "stonehenge_roomconfig_RoomName_37",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -665,7 +665,7 @@
"key": "stonehenge_roomconfig_RoomName_38",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -683,7 +683,7 @@
"key": "stonehenge_roomconfig_RoomName_39",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -701,7 +701,7 @@
"key": "stonehenge_roomconfig_RoomName_40",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -717,7 +717,7 @@
"key": "stonehenge_roomconfig_RoomName_41",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -735,7 +735,7 @@
"key": "stonehenge_roomconfig_RoomName_42",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -753,7 +753,7 @@
"key": "stonehenge_roomconfig_RoomName_43",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -771,7 +771,7 @@
"key": "stonehenge_roomconfig_RoomName_44",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -789,7 +789,7 @@
"key": "stonehenge_roomconfig_RoomName_45",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -807,7 +807,7 @@
"key": "stonehenge_roomconfig_RoomName_46",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -823,7 +823,7 @@
"key": "stonehenge_roomconfig_RoomName_47",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_02",
"SceneName": "StonehengeScene2",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 0,
@ -841,7 +841,7 @@
"key": "stonehenge_roomconfig_RoomName_48",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -859,7 +859,7 @@
"key": "stonehenge_roomconfig_RoomName_49",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -877,7 +877,7 @@
"key": "stonehenge_roomconfig_RoomName_50",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -895,7 +895,7 @@
"key": "stonehenge_roomconfig_RoomName_51",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -913,7 +913,7 @@
"key": "stonehenge_roomconfig_RoomName_52",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -931,7 +931,7 @@
"key": "stonehenge_roomconfig_RoomName_53",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -949,7 +949,7 @@
"key": "stonehenge_roomconfig_RoomName_54",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -967,7 +967,7 @@
"key": "stonehenge_roomconfig_RoomName_55",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -985,7 +985,7 @@
"key": "stonehenge_roomconfig_RoomName_56",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1003,7 +1003,7 @@
"key": "stonehenge_roomconfig_RoomName_57",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1021,7 +1021,7 @@
"key": "stonehenge_roomconfig_RoomName_58",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1037,7 +1037,7 @@
"key": "stonehenge_roomconfig_RoomName_59",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1055,7 +1055,7 @@
"key": "stonehenge_roomconfig_RoomName_60",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1073,7 +1073,7 @@
"key": "stonehenge_roomconfig_RoomName_61",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1091,7 +1091,7 @@
"key": "stonehenge_roomconfig_RoomName_62",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1109,7 +1109,7 @@
"key": "stonehenge_roomconfig_RoomName_63",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1127,7 +1127,7 @@
"key": "stonehenge_roomconfig_RoomName_64",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1143,7 +1143,7 @@
"key": "stonehenge_roomconfig_RoomName_65",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_02",
"SceneName": "StonehengeScene2",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 0,
@ -1161,7 +1161,7 @@
"key": "stonehenge_roomconfig_RoomName_66",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1179,7 +1179,7 @@
"key": "stonehenge_roomconfig_RoomName_67",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1197,7 +1197,7 @@
"key": "stonehenge_roomconfig_RoomName_68",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1215,7 +1215,7 @@
"key": "stonehenge_roomconfig_RoomName_69",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1233,7 +1233,7 @@
"key": "stonehenge_roomconfig_RoomName_70",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1251,7 +1251,7 @@
"key": "stonehenge_roomconfig_RoomName_71",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1269,7 +1269,7 @@
"key": "stonehenge_roomconfig_RoomName_72",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1287,7 +1287,7 @@
"key": "stonehenge_roomconfig_RoomName_73",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1305,7 +1305,7 @@
"key": "stonehenge_roomconfig_RoomName_74",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1323,7 +1323,7 @@
"key": "stonehenge_roomconfig_RoomName_75",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1341,7 +1341,7 @@
"key": "stonehenge_roomconfig_RoomName_76",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1357,7 +1357,7 @@
"key": "stonehenge_roomconfig_RoomName_77",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1375,7 +1375,7 @@
"key": "stonehenge_roomconfig_RoomName_78",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1393,7 +1393,7 @@
"key": "stonehenge_roomconfig_RoomName_79",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1411,7 +1411,7 @@
"key": "stonehenge_roomconfig_RoomName_80",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1429,7 +1429,7 @@
"key": "stonehenge_roomconfig_RoomName_81",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1447,7 +1447,7 @@
"key": "stonehenge_roomconfig_RoomName_82",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1463,7 +1463,7 @@
"key": "stonehenge_roomconfig_RoomName_83",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_02",
"SceneName": "StonehengeScene2",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 0,
@ -1481,7 +1481,7 @@
"key": "stonehenge_roomconfig_RoomName_84",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1499,7 +1499,7 @@
"key": "stonehenge_roomconfig_RoomName_85",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1517,7 +1517,7 @@
"key": "stonehenge_roomconfig_RoomName_86",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1535,7 +1535,7 @@
"key": "stonehenge_roomconfig_RoomName_87",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1553,7 +1553,7 @@
"key": "stonehenge_roomconfig_RoomName_88",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1571,7 +1571,7 @@
"key": "stonehenge_roomconfig_RoomName_89",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1589,7 +1589,7 @@
"key": "stonehenge_roomconfig_RoomName_90",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1607,7 +1607,7 @@
"key": "stonehenge_roomconfig_RoomName_91",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1625,7 +1625,7 @@
"key": "stonehenge_roomconfig_RoomName_92",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1643,7 +1643,7 @@
"key": "stonehenge_roomconfig_RoomName_93",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1661,7 +1661,7 @@
"key": "stonehenge_roomconfig_RoomName_94",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1677,7 +1677,7 @@
"key": "stonehenge_roomconfig_RoomName_95",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1695,7 +1695,7 @@
"key": "stonehenge_roomconfig_RoomName_96",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1713,7 +1713,7 @@
"key": "stonehenge_roomconfig_RoomName_97",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1731,7 +1731,7 @@
"key": "stonehenge_roomconfig_RoomName_98",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1749,7 +1749,7 @@
"key": "stonehenge_roomconfig_RoomName_99",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1767,7 +1767,7 @@
"key": "stonehenge_roomconfig_RoomName_100",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1783,7 +1783,7 @@
"key": "stonehenge_roomconfig_RoomName_101",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_02",
"SceneName": "StonehengeScene2",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 0,
@ -1801,7 +1801,7 @@
"key": "stonehenge_roomconfig_RoomName_102",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1819,7 +1819,7 @@
"key": "stonehenge_roomconfig_RoomName_103",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1837,7 +1837,7 @@
"key": "stonehenge_roomconfig_RoomName_104",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1855,7 +1855,7 @@
"key": "stonehenge_roomconfig_RoomName_105",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1873,7 +1873,7 @@
"key": "stonehenge_roomconfig_RoomName_106",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1891,7 +1891,7 @@
"key": "stonehenge_roomconfig_RoomName_107",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1909,7 +1909,7 @@
"key": "stonehenge_roomconfig_RoomName_108",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1927,7 +1927,7 @@
"key": "stonehenge_roomconfig_RoomName_109",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1945,7 +1945,7 @@
"key": "stonehenge_roomconfig_RoomName_110",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -1963,7 +1963,7 @@
"key": "stonehenge_roomconfig_RoomName_111",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1981,7 +1981,7 @@
"key": "stonehenge_roomconfig_RoomName_112",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -1997,7 +1997,7 @@
"key": "stonehenge_roomconfig_RoomName_113",
"text": "精英"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -2015,7 +2015,7 @@
"key": "stonehenge_roomconfig_RoomName_114",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -2033,7 +2033,7 @@
"key": "stonehenge_roomconfig_RoomName_115",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -2051,7 +2051,7 @@
"key": "stonehenge_roomconfig_RoomName_116",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
@ -2069,7 +2069,7 @@
"key": "stonehenge_roomconfig_RoomName_117",
"text": "剧情"
},
"SceneName": "scenesfight_secret_realm_03",
"SceneName": "StonehengeScene3",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -2087,7 +2087,7 @@
"key": "stonehenge_roomconfig_RoomName_118",
"text": "商店"
},
"SceneName": "scenesfight_secret_realm_04",
"SceneName": "StonehengeScene4",
"PortalName": "portal_2",
"EventrewardGroup": 0,
"EventBattleGroup": 0,
@ -2103,7 +2103,7 @@
"key": "stonehenge_roomconfig_RoomName_119",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_02",
"SceneName": "StonehengeScene2",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 0,

2
modules/activity/module.go
View File

@ -278,7 +278,7 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32,
// 天数
var idays int32
for i, v1 := range conf.Bosstype {
if v1 == systemtype || v1 == 0 { // bosstype 为0 表示所有的boss 类型都算
if v1 == bosstype || v1 == 0 { // bosstype 为0 表示所有的boss 类型都算
idays = conf.Num[i]
break
}

13
modules/pagoda/api_racechallenge.go
View File

@ -45,10 +45,15 @@ func (this *apiComp) ChallengeRace(session comm.IUserSession, req *pb.PagodaChal
if curWeekDay == 0 {
curWeekDay = 7
}
for _, v := range conf.Openingtime {
if v == curWeekDay {
timeCheckOk = true
break
if len(conf.Openingtime) == 0 {
timeCheckOk = true
} else {
for _, v := range conf.Openingtime {
if v == curWeekDay {
timeCheckOk = true
break
}
}
}
if !timeCheckOk {

6
modules/stonehenge/configure.go
View File

@ -223,7 +223,8 @@ func (this *configureComp) GetEventGroupDataByLottery(lotterys ...int32) (event
}
}
} else if this.BtypeE[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比）
}
if this.BtypeE[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比）
// 每个小组id 都随机取一次
var szGroupID []int32 // 获得的权重数组
gourp := make([]*cfg.GameEventlotteryData, 0) // key 小组ID value 权重
@ -405,7 +406,8 @@ func (this *configureComp) GetRoomGroupDataByLottery(lotteryId int32) (rooms []i
}
return
}
} else if this.BtypeR[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比）
}
if this.BtypeR[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比）
// 每个小组id 都随机取一次
var szGroupID []int32 // 获得的权重数组
gourp := make([]*cfg.GameRoomlotteryData, 0) // key 小组ID value 权重

15
modules/tools/comp_configure.go
View File

@ -89,7 +89,6 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com
this.SNum = make(map[int64]int32, 0)
configure.RegisterConfigure(game_lottery, cfg.NewGameLottery, this.LoadGroupData)
this.GetGroupDataByLottery(30020, 0, 1)
return
}
@ -106,6 +105,7 @@ func (this *MCompConfigure) LoadGroupData() {
this.Btype = make(map[int32]int32, 0)
this.Stype = make(map[int64]int32, 0)
this.SNum = make(map[int64]int32, 0)
var tmp int64
for _, value := range configure.GetDataList() {
key := int64(value.Lotteryid)<<31 + int64(value.Groupid)
this._group[key] = append(this._group[key], value.Id)
@ -135,9 +135,15 @@ func (this *MCompConfigure) LoadGroupData() {
this.SNum[key] = value.Groupnum
}
if this.Btype[value.Lotteryid] == 1 {
this._lotteryType1[value.Lotteryid] = append(this._lotteryType1[value.Lotteryid], value.Id)
if tmp != key {
this._lotteryType1[value.Lotteryid] = append(this._lotteryType1[value.Lotteryid], value.Id)
tmp = key
}
} else if this.Btype[value.Lotteryid] == 2 {
this._lotteryType2[value.Lotteryid] = append(this._lotteryType2[value.Lotteryid], value.Id)
if tmp != key {
this._lotteryType2[value.Lotteryid] = append(this._lotteryType2[value.Lotteryid], value.Id)
tmp = key
}
}
if this.Stype[key] == 1 { // 小组ID为1
@ -234,7 +240,8 @@ func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32,
}
return
}
} else if this.Btype[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比）
}
if this.Btype[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比）
// 每个小组id 都随机取一次
var szGroupID []int32 // 获得的权重数组
gourp := make([]*cfg.GameLotteryData, 0) // key 小组ID value 权重