Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
ef306f6d54
@ -318,5 +318,15 @@
|
|||||||
},
|
},
|
||||||
"data": "10,10",
|
"data": "10,10",
|
||||||
"prefix": "bingo:race,{}"
|
"prefix": "bingo:race,{}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 35,
|
||||||
|
"type": 1,
|
||||||
|
"text": {
|
||||||
|
"key": "GM_GM_text_35",
|
||||||
|
"text": "代金券增加(填数量)"
|
||||||
|
},
|
||||||
|
"data": "1000",
|
||||||
|
"prefix": "bingo:item,10000035,{0}"
|
||||||
}
|
}
|
||||||
]
|
]
|
@ -6,7 +6,7 @@
|
|||||||
"text": "开启宝箱"
|
"text": "开启宝箱"
|
||||||
},
|
},
|
||||||
"EventType": 10,
|
"EventType": 10,
|
||||||
"EventResource": "event_rewardbox_1",
|
"EventResource": "event_treasure_1",
|
||||||
"Value1": 21100001,
|
"Value1": 21100001,
|
||||||
"Value2": 2,
|
"Value2": 2,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
@ -22,7 +22,7 @@
|
|||||||
"text": "开启宝箱"
|
"text": "开启宝箱"
|
||||||
},
|
},
|
||||||
"EventType": 10,
|
"EventType": 10,
|
||||||
"EventResource": "event_rewardbox_1",
|
"EventResource": "event_treasure_1",
|
||||||
"Value1": 21100002,
|
"Value1": 21100002,
|
||||||
"Value2": 2,
|
"Value2": 2,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
@ -38,7 +38,7 @@
|
|||||||
"text": "开启宝箱"
|
"text": "开启宝箱"
|
||||||
},
|
},
|
||||||
"EventType": 10,
|
"EventType": 10,
|
||||||
"EventResource": "event_rewardbox_1",
|
"EventResource": "event_treasure_1",
|
||||||
"Value1": 21100003,
|
"Value1": 21100003,
|
||||||
"Value2": 2,
|
"Value2": 2,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
@ -54,7 +54,7 @@
|
|||||||
"text": "开启宝箱"
|
"text": "开启宝箱"
|
||||||
},
|
},
|
||||||
"EventType": 10,
|
"EventType": 10,
|
||||||
"EventResource": "event_rewardbox_1",
|
"EventResource": "event_treasure_1",
|
||||||
"Value1": 21100004,
|
"Value1": 21100004,
|
||||||
"Value2": 2,
|
"Value2": 2,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
@ -70,7 +70,7 @@
|
|||||||
"text": "开启宝箱"
|
"text": "开启宝箱"
|
||||||
},
|
},
|
||||||
"EventType": 10,
|
"EventType": 10,
|
||||||
"EventResource": "event_rewardbox_1",
|
"EventResource": "event_treasure_1",
|
||||||
"Value1": 21100005,
|
"Value1": 21100005,
|
||||||
"Value2": 2,
|
"Value2": 2,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
@ -86,7 +86,7 @@
|
|||||||
"text": "开启宝箱"
|
"text": "开启宝箱"
|
||||||
},
|
},
|
||||||
"EventType": 10,
|
"EventType": 10,
|
||||||
"EventResource": "event_rewardbox_1",
|
"EventResource": "event_treasure_1",
|
||||||
"Value1": 21100006,
|
"Value1": 21100006,
|
||||||
"Value2": 2,
|
"Value2": 2,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
@ -102,7 +102,7 @@
|
|||||||
"text": "开启宝箱"
|
"text": "开启宝箱"
|
||||||
},
|
},
|
||||||
"EventType": 10,
|
"EventType": 10,
|
||||||
"EventResource": "event_rewardbox_1",
|
"EventResource": "event_treasure_1",
|
||||||
"Value1": 21100007,
|
"Value1": 21100007,
|
||||||
"Value2": 2,
|
"Value2": 2,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
@ -118,7 +118,7 @@
|
|||||||
"text": "开启宝箱"
|
"text": "开启宝箱"
|
||||||
},
|
},
|
||||||
"EventType": 10,
|
"EventType": 10,
|
||||||
"EventResource": "event_rewardbox_1",
|
"EventResource": "event_treasure_1",
|
||||||
"Value1": 21100008,
|
"Value1": 21100008,
|
||||||
"Value2": 2,
|
"Value2": 2,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
@ -134,7 +134,7 @@
|
|||||||
"text": "开启宝箱"
|
"text": "开启宝箱"
|
||||||
},
|
},
|
||||||
"EventType": 10,
|
"EventType": 10,
|
||||||
"EventResource": "event_rewardbox_1",
|
"EventResource": "event_treasure_1",
|
||||||
"Value1": 21100009,
|
"Value1": 21100009,
|
||||||
"Value2": 1,
|
"Value2": 1,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
@ -203,7 +203,13 @@
|
|||||||
"Value2": 0,
|
"Value2": 0,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
"Value4": 0,
|
"Value4": 0,
|
||||||
"CostItem": [],
|
"CostItem": [
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "gold",
|
||||||
|
"n": 10
|
||||||
|
}
|
||||||
|
],
|
||||||
"PostEvent": 0,
|
"PostEvent": 0,
|
||||||
"probability": 0
|
"probability": 0
|
||||||
},
|
},
|
||||||
@ -219,7 +225,13 @@
|
|||||||
"Value2": 0,
|
"Value2": 0,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
"Value4": 0,
|
"Value4": 0,
|
||||||
"CostItem": [],
|
"CostItem": [
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "gold",
|
||||||
|
"n": 10
|
||||||
|
}
|
||||||
|
],
|
||||||
"PostEvent": 0,
|
"PostEvent": 0,
|
||||||
"probability": 0
|
"probability": 0
|
||||||
},
|
},
|
||||||
@ -235,7 +247,13 @@
|
|||||||
"Value2": 5,
|
"Value2": 5,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
"Value4": 0,
|
"Value4": 0,
|
||||||
"CostItem": [],
|
"CostItem": [
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "gold",
|
||||||
|
"n": 10
|
||||||
|
}
|
||||||
|
],
|
||||||
"PostEvent": 0,
|
"PostEvent": 0,
|
||||||
"probability": 0
|
"probability": 0
|
||||||
},
|
},
|
||||||
@ -375,7 +393,7 @@
|
|||||||
},
|
},
|
||||||
"EventType": 12,
|
"EventType": 12,
|
||||||
"EventResource": "event_story",
|
"EventResource": "event_story",
|
||||||
"Value1": 0,
|
"Value1": 100001,
|
||||||
"Value2": 0,
|
"Value2": 0,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
"Value4": 0,
|
"Value4": 0,
|
||||||
@ -391,7 +409,7 @@
|
|||||||
},
|
},
|
||||||
"EventType": 12,
|
"EventType": 12,
|
||||||
"EventResource": "event_story",
|
"EventResource": "event_story",
|
||||||
"Value1": 0,
|
"Value1": 100002,
|
||||||
"Value2": 0,
|
"Value2": 0,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
"Value4": 0,
|
"Value4": 0,
|
||||||
@ -407,7 +425,7 @@
|
|||||||
},
|
},
|
||||||
"EventType": 12,
|
"EventType": 12,
|
||||||
"EventResource": "event_story",
|
"EventResource": "event_story",
|
||||||
"Value1": 0,
|
"Value1": 100003,
|
||||||
"Value2": 0,
|
"Value2": 0,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
"Value4": 0,
|
"Value4": 0,
|
||||||
@ -423,7 +441,7 @@
|
|||||||
},
|
},
|
||||||
"EventType": 12,
|
"EventType": 12,
|
||||||
"EventResource": "event_story",
|
"EventResource": "event_story",
|
||||||
"Value1": 0,
|
"Value1": 100004,
|
||||||
"Value2": 0,
|
"Value2": 0,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
"Value4": 0,
|
"Value4": 0,
|
||||||
@ -439,7 +457,7 @@
|
|||||||
},
|
},
|
||||||
"EventType": 12,
|
"EventType": 12,
|
||||||
"EventResource": "event_story",
|
"EventResource": "event_story",
|
||||||
"Value1": 0,
|
"Value1": 100005,
|
||||||
"Value2": 0,
|
"Value2": 0,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
"Value4": 0,
|
"Value4": 0,
|
||||||
@ -455,7 +473,7 @@
|
|||||||
},
|
},
|
||||||
"EventType": 12,
|
"EventType": 12,
|
||||||
"EventResource": "event_story",
|
"EventResource": "event_story",
|
||||||
"Value1": 0,
|
"Value1": 100006,
|
||||||
"Value2": 0,
|
"Value2": 0,
|
||||||
"Value3": 0,
|
"Value3": 0,
|
||||||
"Value4": 0,
|
"Value4": 0,
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
"text": "离开石阵秘境"
|
"text": "离开石阵秘境"
|
||||||
},
|
},
|
||||||
"SceneName": "",
|
"SceneName": "",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_3",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -60,7 +60,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -96,7 +96,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -166,7 +166,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -202,7 +202,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -256,7 +256,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -292,7 +292,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -362,7 +362,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -398,7 +398,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -452,7 +452,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -488,7 +488,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -558,7 +558,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -594,7 +594,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -648,7 +648,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -684,7 +684,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -702,7 +702,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -754,7 +754,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -790,7 +790,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -808,7 +808,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -878,7 +878,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -914,7 +914,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -968,7 +968,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1004,7 +1004,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1022,7 +1022,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -1074,7 +1074,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1110,7 +1110,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1128,7 +1128,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -1198,7 +1198,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1234,7 +1234,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1288,7 +1288,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1324,7 +1324,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1342,7 +1342,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -1394,7 +1394,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1430,7 +1430,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1448,7 +1448,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -1518,7 +1518,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1554,7 +1554,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1608,7 +1608,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1644,7 +1644,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1662,7 +1662,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -1714,7 +1714,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1750,7 +1750,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1768,7 +1768,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -1838,7 +1838,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1874,7 +1874,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1928,7 +1928,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1964,7 +1964,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -1982,7 +1982,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
@ -2034,7 +2034,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -2070,7 +2070,7 @@
|
|||||||
"text": "剧情"
|
"text": "剧情"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_03",
|
"SceneName": "scenesfight_secret_realm_03",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 12100000,
|
"EventStoryNpcGroup": 12100000,
|
||||||
@ -2088,7 +2088,7 @@
|
|||||||
"text": "商店"
|
"text": "商店"
|
||||||
},
|
},
|
||||||
"SceneName": "scenesfight_secret_realm_04",
|
"SceneName": "scenesfight_secret_realm_04",
|
||||||
"PortalName": "portal_1",
|
"PortalName": "portal_2",
|
||||||
"EventrewardGroup": 0,
|
"EventrewardGroup": 0,
|
||||||
"EventBattleGroup": 0,
|
"EventBattleGroup": 0,
|
||||||
"EventStoryNpcGroup": 0,
|
"EventStoryNpcGroup": 0,
|
||||||
|
@ -4,9 +4,7 @@
|
|||||||
"NodeType": 2,
|
"NodeType": 2,
|
||||||
"NodeIcon": "",
|
"NodeIcon": "",
|
||||||
"listIndex": 1,
|
"listIndex": 1,
|
||||||
"Front": [
|
"Front": [],
|
||||||
0
|
|
||||||
],
|
|
||||||
"CostItem": [
|
"CostItem": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
|
@ -57,13 +57,16 @@ func (this *MStonehenge) GetStonehengeData(uid string) (info *pb.DBStonehenge, e
|
|||||||
}
|
}
|
||||||
if mgo.MongodbNil == err {
|
if mgo.MongodbNil == err {
|
||||||
info = &pb.DBStonehenge{
|
info = &pb.DBStonehenge{
|
||||||
Id: primitive.NewObjectID().Hex(),
|
Id: primitive.NewObjectID().Hex(),
|
||||||
Uid: uid,
|
Uid: uid,
|
||||||
Userbuff: make(map[int32]int32),
|
Userbuff: make(map[int32]int32),
|
||||||
Reward: make(map[int32]bool),
|
Reward: make(map[int32]bool),
|
||||||
Addweight: make(map[int32]int32),
|
Addweight: make(map[int32]int32),
|
||||||
Etime: utils.WeekIntervalTime(),
|
Etime: utils.WeekIntervalTime(),
|
||||||
Hero: make(map[string]*pb.BattleRole),
|
Hero: make(map[string]*pb.BattleRole),
|
||||||
|
Talent: make(map[int32]bool),
|
||||||
|
Talentproperty: make(map[string]int32),
|
||||||
|
Privilege: make([]pb.StonehengePrivilege, 0),
|
||||||
}
|
}
|
||||||
err = this.Add(uid, info)
|
err = this.Add(uid, info)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user