Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
37b01c0f3c
@ -2,13 +2,13 @@
|
||||
{
|
||||
"key": 1,
|
||||
"card_pool_type": "inevitable_20001",
|
||||
"id": "44004",
|
||||
"id": "13002",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 2,
|
||||
"card_pool_type": "inevitable_20010",
|
||||
"id": "34006",
|
||||
"id": "15003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1440,7 +1440,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 20200,
|
||||
"afterstoryid": 20201,
|
||||
"mainlineName": {
|
||||
@ -1529,7 +1529,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 20204,
|
||||
"afterstoryid": 20206,
|
||||
"mainlineName": {
|
||||
@ -1618,7 +1618,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 20207,
|
||||
"afterstoryid": 20209,
|
||||
"mainlineName": {
|
||||
@ -1707,7 +1707,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 20210,
|
||||
"afterstoryid": 20211,
|
||||
"mainlineName": {
|
||||
@ -1796,7 +1796,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 20222,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -1885,7 +1885,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 20223,
|
||||
"afterstoryid": 20224,
|
||||
"mainlineName": {
|
||||
@ -1974,7 +1974,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 20228,
|
||||
"afterstoryid": 20231,
|
||||
"mainlineName": {
|
||||
@ -2063,7 +2063,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 20232,
|
||||
"afterstoryid": 20233,
|
||||
"mainlineName": {
|
||||
@ -2152,7 +2152,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_xunlong",
|
||||
"detailwindow": "effect_shilaike",
|
||||
"frontstoryid": 20300,
|
||||
"afterstoryid": 20305,
|
||||
"mainlineName": {
|
||||
@ -2241,7 +2241,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_xunlong",
|
||||
"detailwindow": "effect_shilaike",
|
||||
"frontstoryid": 20306,
|
||||
"afterstoryid": 20307,
|
||||
"mainlineName": {
|
||||
@ -2330,7 +2330,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_xunlong",
|
||||
"detailwindow": "effect_shilaike",
|
||||
"frontstoryid": 20309,
|
||||
"afterstoryid": 20314,
|
||||
"mainlineName": {
|
||||
@ -2419,7 +2419,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_xunlong",
|
||||
"detailwindow": "effect_shilaike",
|
||||
"frontstoryid": 20316,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -2508,7 +2508,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_xunlong",
|
||||
"detailwindow": "effect_shilaike",
|
||||
"frontstoryid": 20317,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -2597,7 +2597,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_xunlong",
|
||||
"detailwindow": "effect_shilaike",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 20318,
|
||||
"mainlineName": {
|
||||
@ -2686,7 +2686,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_xunlong",
|
||||
"detailwindow": "effect_shilaike",
|
||||
"frontstoryid": 20321,
|
||||
"afterstoryid": 20322,
|
||||
"mainlineName": {
|
||||
@ -2775,7 +2775,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_xunlong",
|
||||
"detailwindow": "effect_shilaike",
|
||||
"frontstoryid": 20323,
|
||||
"afterstoryid": 20326,
|
||||
"mainlineName": {
|
||||
@ -2864,7 +2864,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_chezhan",
|
||||
"detailwindow": "effect_xunlong",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -2953,7 +2953,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_chezhan",
|
||||
"detailwindow": "effect_xunlong",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -3042,7 +3042,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_chezhan",
|
||||
"detailwindow": "effect_xunlong",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -3131,7 +3131,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_chezhan",
|
||||
"detailwindow": "effect_xunlong",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -3220,7 +3220,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_chezhan",
|
||||
"detailwindow": "effect_xunlong",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -3309,7 +3309,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_chezhan",
|
||||
"detailwindow": "effect_xunlong",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -3398,7 +3398,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_chezhan",
|
||||
"detailwindow": "effect_xunlong",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -3487,7 +3487,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_chezhan",
|
||||
"detailwindow": "effect_xunlong",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -4288,7 +4288,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -4377,7 +4377,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -4466,7 +4466,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -4555,7 +4555,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -4644,7 +4644,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -4733,7 +4733,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -4822,7 +4822,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -4911,7 +4911,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -7136,7 +7136,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -7225,7 +7225,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -7314,7 +7314,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -7403,7 +7403,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -7492,7 +7492,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -7581,7 +7581,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -7670,7 +7670,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -7759,7 +7759,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -9984,7 +9984,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -10073,7 +10073,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -10162,7 +10162,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -10251,7 +10251,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -10340,7 +10340,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -10429,7 +10429,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -10518,7 +10518,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -10607,7 +10607,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -12832,7 +12832,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -12921,7 +12921,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -13010,7 +13010,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -13099,7 +13099,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -13188,7 +13188,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -13277,7 +13277,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -13366,7 +13366,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -13455,7 +13455,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -15680,7 +15680,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -15769,7 +15769,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -15858,7 +15858,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -15947,7 +15947,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -16036,7 +16036,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -16125,7 +16125,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -16214,7 +16214,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -16303,7 +16303,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -18528,7 +18528,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -18617,7 +18617,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -18706,7 +18706,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -18795,7 +18795,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -18884,7 +18884,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -18973,7 +18973,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -19062,7 +19062,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -19151,7 +19151,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -21376,7 +21376,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -21465,7 +21465,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -21554,7 +21554,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -21643,7 +21643,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -21732,7 +21732,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -21821,7 +21821,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -21910,7 +21910,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -21999,7 +21999,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -24224,7 +24224,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -24313,7 +24313,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -24402,7 +24402,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -24491,7 +24491,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -24580,7 +24580,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -24669,7 +24669,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -24758,7 +24758,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -24847,7 +24847,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -27072,7 +27072,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -27161,7 +27161,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -27250,7 +27250,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -27339,7 +27339,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -27428,7 +27428,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -27517,7 +27517,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -27606,7 +27606,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -27695,7 +27695,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -29920,7 +29920,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -30009,7 +30009,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -30098,7 +30098,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -30187,7 +30187,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -30276,7 +30276,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -30365,7 +30365,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -30454,7 +30454,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -30543,7 +30543,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -32768,7 +32768,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -32857,7 +32857,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -32946,7 +32946,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -33035,7 +33035,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -33124,7 +33124,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -33213,7 +33213,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -33302,7 +33302,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
@ -33391,7 +33391,7 @@
|
||||
"z": 0
|
||||
},
|
||||
"EditorStage": 0,
|
||||
"detailwindow": "effect_huaidan",
|
||||
"detailwindow": "effect_huaidanlianmeng",
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"mainlineName": {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2597,7 +2597,7 @@
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
2000
|
||||
1170
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [
|
||||
@ -2781,7 +2781,7 @@
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
1470
|
||||
4000
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [
|
||||
@ -2855,7 +2855,7 @@
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
4000
|
||||
4100
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [
|
||||
@ -2929,7 +2929,7 @@
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
4100
|
||||
4200
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [
|
||||
@ -3003,7 +3003,7 @@
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
4200
|
||||
4300
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [
|
||||
@ -3077,7 +3077,7 @@
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
4300
|
||||
4400
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [
|
||||
@ -28789,11 +28789,9 @@
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
600
|
||||
],
|
||||
"FollowSK": [
|
||||
255005312
|
||||
300
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -28814,7 +28812,7 @@
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
11000
|
||||
5500
|
||||
],
|
||||
"FollowSK": [
|
||||
255005313
|
||||
|
||||
@ -21858,7 +21858,8 @@
|
||||
"Target": 2,
|
||||
"ChildSkill": {
|
||||
"Id": [
|
||||
255005311
|
||||
255005311,
|
||||
255005312
|
||||
]
|
||||
},
|
||||
"Desc": {
|
||||
|
||||
@ -416,7 +416,7 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E
|
||||
}
|
||||
Query := bson.M{}
|
||||
Query["merchantmoney"] = 0
|
||||
_, err := this.modelCaravan.DB.UpdateMany(core.SqlTable(comm.TableUser), bson.M{}, bson.M{"$set": Query}, options.MergeUpdateOptions().SetUpsert(true)) //, new(options.UpdateOptions).SetUpsert(true)
|
||||
_, err := this.modelCaravan.DB.UpdateMany(core.SqlTable(comm.TableUser), bson.M{"merchantmoney": bson.M{"$gt": 0}}, bson.M{"$set": Query}, options.MergeUpdateOptions().SetUpsert(true)) //, new(options.UpdateOptions).SetUpsert(true)
|
||||
if err != nil {
|
||||
this.Errorf("UpdateMany error: %v", err)
|
||||
}
|
||||
|
||||
@ -15,6 +15,7 @@ type GameItemLinkData struct {
|
||||
Title string
|
||||
Desc string
|
||||
Jumpid int32
|
||||
BtnTitle string
|
||||
Icon string
|
||||
}
|
||||
|
||||
@ -29,6 +30,7 @@ func (_v *GameItemLinkData)Deserialize(_buf map[string]interface{}) (err error)
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpid"].(float64); !_ok_ { err = errors.New("jumpid error"); return }; _v.Jumpid = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["btnTitle"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BtnTitle error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BtnTitle, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
|
||||
return
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user