Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
liwei1dao
commit
4fb07bae3f
@ -28,7 +28,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 3
|
||||
"plantrue": 4
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
@ -90,7 +90,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 1
|
||||
"plantrue": 8
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
@ -98,7 +98,7 @@
|
||||
"type": 1,
|
||||
"topic": {
|
||||
"key": "ask_ask_library_topic_04",
|
||||
"text": "阿宝的父亲是谁？注意是亲生父亲。"
|
||||
"text": "阿宝的亲生父亲是谁？"
|
||||
},
|
||||
"planA": {
|
||||
"key": "ask_ask_library_planA_04",
|
||||
@ -106,7 +106,7 @@
|
||||
},
|
||||
"planB": {
|
||||
"key": "ask_ask_library_planB_04",
|
||||
"text": "凹先生"
|
||||
"text": "美美"
|
||||
},
|
||||
"planC": {
|
||||
"key": "ask_ask_library_planC_04",
|
||||
@ -121,7 +121,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 4
|
||||
"plantrue": 8
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
@ -183,7 +183,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 3
|
||||
"plantrue": 4
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
@ -276,7 +276,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 3
|
||||
"plantrue": 4
|
||||
},
|
||||
{
|
||||
"id": 10,
|
||||
@ -338,7 +338,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 4
|
||||
"plantrue": 8
|
||||
},
|
||||
{
|
||||
"id": 12,
|
||||
@ -400,7 +400,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 4
|
||||
"plantrue": 8
|
||||
},
|
||||
{
|
||||
"id": 14,
|
||||
@ -462,7 +462,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 3
|
||||
"plantrue": 4
|
||||
},
|
||||
{
|
||||
"id": 16,
|
||||
@ -493,7 +493,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 4
|
||||
"plantrue": 8
|
||||
},
|
||||
{
|
||||
"id": 17,
|
||||
@ -555,7 +555,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 3
|
||||
"plantrue": 4
|
||||
},
|
||||
{
|
||||
"id": 19,
|
||||
@ -586,7 +586,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 3
|
||||
"plantrue": 4
|
||||
},
|
||||
{
|
||||
"id": 20,
|
||||
@ -617,7 +617,7 @@
|
||||
"True": "",
|
||||
"flase": "",
|
||||
"fraction": 1,
|
||||
"plantrue": 4
|
||||
"plantrue": 8
|
||||
},
|
||||
{
|
||||
"id": 21,
|
||||
|
||||
@ -1343,6 +1343,40 @@
|
||||
"PlayType": 0,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_05",
|
||||
"battleScenes": [
|
||||
"scenesfight_12"
|
||||
],
|
||||
"BGMusic": "",
|
||||
"LoadingId": 0,
|
||||
"HideAlienSpace": 0,
|
||||
"RuleTips": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"BattleTips": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"battleEvents": [],
|
||||
"ScoreGroupID": 0,
|
||||
"disableAiCamera": 0,
|
||||
"ChoseCamp": [],
|
||||
"DisableCamp": [],
|
||||
"DefaultHero": 0,
|
||||
"ChoseHero": [],
|
||||
"DisableHero": [],
|
||||
"LockSlots": [],
|
||||
"HeroCheck": [],
|
||||
"RedAssistTeam": 0,
|
||||
"BlueAssistTeam": 0,
|
||||
"CanFriendHelp": 0,
|
||||
"Numrounds": 0
|
||||
},
|
||||
{
|
||||
"id": 140,
|
||||
"PlayType": 0,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_05",
|
||||
"battleScenes": [
|
||||
"scenesfight_11"
|
||||
],
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1385,5 +1385,17 @@
|
||||
"id": 237,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 238,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 239,
|
||||
"insert": 1,
|
||||
"filter": [
|
||||
"eq"
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -177,7 +177,7 @@
|
||||
],
|
||||
"showmodel": "54102_3_exhibition",
|
||||
"model": "54102_3",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/peoplepos",
|
||||
"etime": 50,
|
||||
"stime": 10,
|
||||
"hp": 70,
|
||||
@ -209,7 +209,7 @@
|
||||
],
|
||||
"showmodel": "54103_1_exhibition",
|
||||
"model": "54103_1",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"point": "",
|
||||
"etime": 0,
|
||||
"stime": 0,
|
||||
"hp": 0,
|
||||
@ -241,7 +241,7 @@
|
||||
],
|
||||
"showmodel": "54103_2_exhibition",
|
||||
"model": "54103_2",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"point": "",
|
||||
"etime": 0,
|
||||
"stime": 0,
|
||||
"hp": 0,
|
||||
@ -273,7 +273,7 @@
|
||||
],
|
||||
"showmodel": "54103_3_exhibition",
|
||||
"model": "54103_3",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/peoplepos",
|
||||
"etime": 45,
|
||||
"stime": 10,
|
||||
"hp": 110,
|
||||
|
||||
@ -612,7 +612,7 @@
|
||||
"cityman": 34006,
|
||||
"cityname": {
|
||||
"key": "caravan_caravan_city_cityname_6",
|
||||
"text": "精灵王国"
|
||||
"text": "童话王国"
|
||||
},
|
||||
"cityinformation": {
|
||||
"key": "caravan_caravan_city_cityinformation_6",
|
||||
@ -1116,7 +1116,7 @@
|
||||
"cityman": 14007,
|
||||
"cityname": {
|
||||
"key": "caravan_caravan_city_cityname_10",
|
||||
"text": "童话大陆"
|
||||
"text": "精灵王国"
|
||||
},
|
||||
"cityinformation": {
|
||||
"key": "caravan_caravan_city_cityinformation_10",
|
||||
|
||||
@ -5,7 +5,11 @@
|
||||
"key": "catchbug_skill_skillname_1",
|
||||
"text": "暗影作祟"
|
||||
},
|
||||
"round": 1
|
||||
"round": 1,
|
||||
"skilldescribe": {
|
||||
"key": "catchbug_skill_skilldescribe_1",
|
||||
"text": "场上随机2*2的区域会随机逆时针或者顺时针旋转90度"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
@ -13,7 +17,11 @@
|
||||
"key": "catchbug_skill_skillname_2",
|
||||
"text": "乾坤旋转"
|
||||
},
|
||||
"round": 3
|
||||
"round": 3,
|
||||
"skilldescribe": {
|
||||
"key": "catchbug_skill_skilldescribe_2",
|
||||
"text": "场上以中心点开始，分为4个2*3的对称区域，这个四个区域会随机顺时针或逆时针旋转"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
@ -21,7 +29,11 @@
|
||||
"key": "catchbug_skill_skillname_3",
|
||||
"text": "地雷滚滚"
|
||||
},
|
||||
"round": 2
|
||||
"round": 2,
|
||||
"skilldescribe": {
|
||||
"key": "catchbug_skill_skilldescribe_3",
|
||||
"text": "场上随机数量2的倍数的卡牌（2，4，6）会开始互相随机交换。"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
@ -29,6 +41,10 @@
|
||||
"key": "catchbug_skill_skillname_4",
|
||||
"text": "电光火石"
|
||||
},
|
||||
"round": 1
|
||||
"round": 1,
|
||||
"skilldescribe": {
|
||||
"key": "catchbug_skill_skilldescribe_4",
|
||||
"text": "消除失败与成功获得的时间翻倍计算"
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -8,11 +8,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -25,11 +20,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -42,11 +32,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -59,11 +44,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -76,11 +56,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -93,11 +68,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -110,11 +80,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -127,11 +92,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -144,11 +104,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -161,11 +116,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -178,11 +128,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -195,11 +140,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -212,11 +152,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -229,11 +164,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -246,11 +176,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -263,11 +188,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
26
bin/json/game_effect.json
Normal file
26
bin/json/game_effect.json
Normal file
@ -0,0 +1,26 @@
|
||||
[
|
||||
{
|
||||
"key": "character_move_fast_1",
|
||||
"path": "Effect/Character/effect_character_move_fast_1.prefab"
|
||||
},
|
||||
{
|
||||
"key": "character_move_fast_2",
|
||||
"path": "Effect/Character/effect_character_move_fast_2.prefab"
|
||||
},
|
||||
{
|
||||
"key": "character_move_arrow",
|
||||
"path": "Effect/Character/effect_character_move_arrow.prefab"
|
||||
},
|
||||
{
|
||||
"key": "character_move_runningOnWater",
|
||||
"path": "Effect/Character/effect_character_move_runningOnWater.prefab"
|
||||
},
|
||||
{
|
||||
"key": "character_move_walkOnWater",
|
||||
"path": "Effect/Character/effect_character_move_walkOnWater.prefab"
|
||||
},
|
||||
{
|
||||
"key": "character_move_brakeOnRunning",
|
||||
"path": "Effect/Character/effect_character_move_brakeOnRunning.prefab"
|
||||
}
|
||||
]
|
||||
@ -8,11 +8,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -25,11 +20,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 2
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100001
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -42,11 +32,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 3
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100002
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -59,11 +44,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 4
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100003
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -76,11 +56,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 5
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100004
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -93,11 +68,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 6
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100005
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -110,11 +80,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 7
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100006
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -127,11 +92,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 8
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100007
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -144,11 +104,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 9
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100008
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -161,11 +116,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100009
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -178,11 +128,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 11
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100010
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -195,11 +140,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 12
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100011
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -212,11 +152,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 13
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100012
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -229,11 +164,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 14
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100013
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -246,11 +176,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 15
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100014
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -263,11 +188,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 16
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100015
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -8,11 +8,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100000
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -25,11 +20,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 2
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100001
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -42,11 +32,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 3
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100002
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -59,11 +44,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 4
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100003
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -76,11 +56,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 5
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100004
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -93,11 +68,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 6
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100005
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -110,11 +80,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 7
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100006
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -127,11 +92,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 8
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100007
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -144,11 +104,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 9
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100008
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -161,11 +116,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100009
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -178,11 +128,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 11
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100010
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -195,11 +140,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 12
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100011
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -212,11 +152,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 13
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100012
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -229,11 +164,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 14
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100013
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -246,11 +176,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 15
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100014
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -263,11 +188,6 @@
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 16
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 100015
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -883,6 +883,12 @@
|
||||
"n": 1
|
||||
},
|
||||
"td_Hp": 100,
|
||||
"td_division_angle": 3
|
||||
"td_division_angle": 3,
|
||||
"playerexname": "achieve_achieve_all_achieve_group_id_06",
|
||||
"initper": {
|
||||
"a": "per",
|
||||
"t": "16010000",
|
||||
"n": 1
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -192,6 +192,16 @@
|
||||
{
|
||||
"id": 20,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_20",
|
||||
"text": "加用户经验"
|
||||
},
|
||||
"data": "1000",
|
||||
"prefix": "bingo:attr,exp,{0}"
|
||||
},
|
||||
{
|
||||
"id": 21,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_21",
|
||||
"text": "获得联盟经验(填经验值)"
|
||||
@ -200,7 +210,7 @@
|
||||
"prefix": "bingo:sociatyexp,{0}"
|
||||
},
|
||||
{
|
||||
"id": 21,
|
||||
"id": 22,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_22",
|
||||
@ -210,7 +220,7 @@
|
||||
"prefix": "bingo:sociatyactivity,{0}"
|
||||
},
|
||||
{
|
||||
"id": 22,
|
||||
"id": 23,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_23",
|
||||
@ -220,7 +230,7 @@
|
||||
"prefix": "bingo:moon,{0}"
|
||||
},
|
||||
{
|
||||
"id": 23,
|
||||
"id": 24,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_24",
|
||||
@ -230,7 +240,7 @@
|
||||
"prefix": "bingo:arena,{0}"
|
||||
},
|
||||
{
|
||||
"id": 24,
|
||||
"id": 25,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_25",
|
||||
@ -240,7 +250,7 @@
|
||||
"prefix": "bingo:mainline,{0}"
|
||||
},
|
||||
{
|
||||
"id": 25,
|
||||
"id": 26,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_26",
|
||||
@ -250,7 +260,7 @@
|
||||
"prefix": "bingo:pataid,{0}"
|
||||
},
|
||||
{
|
||||
"id": 26,
|
||||
"id": 27,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_28",
|
||||
@ -260,7 +270,7 @@
|
||||
"prefix": "bingo:worldtask,{0}"
|
||||
},
|
||||
{
|
||||
"id": 27,
|
||||
"id": 28,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_29",
|
||||
@ -270,7 +280,7 @@
|
||||
"prefix": "bingo:{0}"
|
||||
},
|
||||
{
|
||||
"id": 28,
|
||||
"id": 29,
|
||||
"type": 3,
|
||||
"text": {
|
||||
"key": "GM_GM_text_30",
|
||||
@ -280,7 +290,7 @@
|
||||
"prefix": "bingo:{0}"
|
||||
},
|
||||
{
|
||||
"id": 29,
|
||||
"id": 30,
|
||||
"type": 1,
|
||||
"text": {
|
||||
"key": "GM_GM_text_31",
|
||||
@ -290,7 +300,7 @@
|
||||
"prefix": "bingo:cleannpc"
|
||||
},
|
||||
{
|
||||
"id": 30,
|
||||
"id": 31,
|
||||
"type": 1,
|
||||
"text": {
|
||||
"key": "GM_GM_text_32",
|
||||
@ -300,7 +310,7 @@
|
||||
"prefix": "bingo:jx"
|
||||
},
|
||||
{
|
||||
"id": 31,
|
||||
"id": 32,
|
||||
"type": 1,
|
||||
"text": {
|
||||
"key": "GM_GM_text_33",
|
||||
@ -310,7 +320,7 @@
|
||||
"prefix": "bingo:godlike"
|
||||
},
|
||||
{
|
||||
"id": 32,
|
||||
"id": 33,
|
||||
"type": 1,
|
||||
"text": {
|
||||
"key": "GM_GM_text_34",
|
||||
@ -320,7 +330,7 @@
|
||||
"prefix": "bingo:race,{}"
|
||||
},
|
||||
{
|
||||
"id": 33,
|
||||
"id": 34,
|
||||
"type": 1,
|
||||
"text": {
|
||||
"key": "GM_GM_text_35",
|
||||
@ -330,7 +340,7 @@
|
||||
"prefix": "bingo:item,10000035,{0}"
|
||||
},
|
||||
{
|
||||
"id": 34,
|
||||
"id": 35,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_36",
|
||||
@ -340,7 +350,7 @@
|
||||
"prefix": "bingo:smithypro"
|
||||
},
|
||||
{
|
||||
"id": 35,
|
||||
"id": 36,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_37",
|
||||
@ -350,7 +360,7 @@
|
||||
"prefix": "bingo:smithyatlas"
|
||||
},
|
||||
{
|
||||
"id": 36,
|
||||
"id": 37,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_38",
|
||||
@ -360,7 +370,7 @@
|
||||
"prefix": "bingo:newmail"
|
||||
},
|
||||
{
|
||||
"id": 37,
|
||||
"id": 38,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_39",
|
||||
@ -370,7 +380,7 @@
|
||||
"prefix": "bingo:buried,{0}"
|
||||
},
|
||||
{
|
||||
"id": 38,
|
||||
"id": 39,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_40",
|
||||
@ -380,7 +390,7 @@
|
||||
"prefix": "bingo:groumet"
|
||||
},
|
||||
{
|
||||
"id": 39,
|
||||
"id": 40,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_41",
|
||||
@ -390,7 +400,7 @@
|
||||
"prefix": "bingo:library"
|
||||
},
|
||||
{
|
||||
"id": 40,
|
||||
"id": 41,
|
||||
"type": 1,
|
||||
"text": {
|
||||
"key": "GM_GM_text_42",
|
||||
@ -400,7 +410,7 @@
|
||||
"prefix": "bingo:mts,20030001,{0}"
|
||||
},
|
||||
{
|
||||
"id": 41,
|
||||
"id": 42,
|
||||
"type": 1,
|
||||
"text": {
|
||||
"key": "GM_GM_text_43",
|
||||
@ -410,7 +420,7 @@
|
||||
"prefix": "bingo:mts,20030002,{0}"
|
||||
},
|
||||
{
|
||||
"id": 42,
|
||||
"id": 43,
|
||||
"type": 1,
|
||||
"text": {
|
||||
"key": "GM_GM_text_44",
|
||||
@ -420,7 +430,7 @@
|
||||
"prefix": "bingo:mts,20030003,{0}"
|
||||
},
|
||||
{
|
||||
"id": 43,
|
||||
"id": 44,
|
||||
"type": 1,
|
||||
"text": {
|
||||
"key": "GM_GM_text_45",
|
||||
@ -430,7 +440,7 @@
|
||||
"prefix": "bingo:opencond"
|
||||
},
|
||||
{
|
||||
"id": 44,
|
||||
"id": 45,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_47",
|
||||
@ -440,7 +450,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 45,
|
||||
"id": 46,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_48",
|
||||
@ -450,7 +460,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 48,
|
||||
"id": 47,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_53",
|
||||
@ -460,7 +470,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 49,
|
||||
"id": 48,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_55",
|
||||
@ -470,7 +480,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 50,
|
||||
"id": 49,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_57",
|
||||
@ -480,7 +490,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 51,
|
||||
"id": 50,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_58",
|
||||
@ -490,7 +500,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 52,
|
||||
"id": 51,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_59",
|
||||
@ -500,7 +510,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 53,
|
||||
"id": 52,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_60",
|
||||
@ -510,7 +520,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 54,
|
||||
"id": 53,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_61",
|
||||
@ -520,7 +530,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 55,
|
||||
"id": 54,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_62",
|
||||
@ -530,7 +540,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 56,
|
||||
"id": 55,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_63",
|
||||
@ -540,7 +550,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 57,
|
||||
"id": 56,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_64",
|
||||
@ -550,7 +560,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 58,
|
||||
"id": 57,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_65",
|
||||
@ -560,7 +570,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 59,
|
||||
"id": 58,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_66",
|
||||
@ -570,7 +580,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 60,
|
||||
"id": 59,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_67",
|
||||
@ -580,7 +590,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 61,
|
||||
"id": 60,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_69",
|
||||
@ -590,7 +600,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 62,
|
||||
"id": 61,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_70",
|
||||
@ -600,7 +610,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 64,
|
||||
"id": 62,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_72",
|
||||
@ -610,7 +620,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 65,
|
||||
"id": 63,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_73",
|
||||
@ -620,7 +630,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 67,
|
||||
"id": 64,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_75",
|
||||
@ -630,7 +640,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 68,
|
||||
"id": 65,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_76",
|
||||
@ -640,7 +650,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 69,
|
||||
"id": 66,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_77",
|
||||
@ -650,7 +660,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 70,
|
||||
"id": 67,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_79",
|
||||
@ -660,7 +670,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 72,
|
||||
"id": 68,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_81",
|
||||
@ -670,7 +680,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 73,
|
||||
"id": 69,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_82",
|
||||
@ -680,7 +690,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 74,
|
||||
"id": 70,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_83",
|
||||
@ -690,7 +700,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 75,
|
||||
"id": 71,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_84",
|
||||
@ -700,7 +710,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 77,
|
||||
"id": 72,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_86",
|
||||
@ -710,7 +720,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 79,
|
||||
"id": 73,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_89",
|
||||
@ -720,7 +730,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 80,
|
||||
"id": 74,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_91",
|
||||
@ -730,7 +740,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 81,
|
||||
"id": 75,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_100",
|
||||
@ -740,7 +750,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 82,
|
||||
"id": 76,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_101",
|
||||
@ -750,7 +760,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 83,
|
||||
"id": 77,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_102",
|
||||
@ -760,7 +770,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 84,
|
||||
"id": 78,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_110",
|
||||
@ -770,7 +780,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 90,
|
||||
"id": 79,
|
||||
"type": 4,
|
||||
"text": {
|
||||
"key": "GM_GM_text_119",
|
||||
@ -780,7 +790,7 @@
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 91,
|
||||
"id": 80,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_127",
|
||||
|
||||
@ -346,7 +346,7 @@
|
||||
"id": "10000008",
|
||||
"name": {
|
||||
"key": "item_item_name_8",
|
||||
"text": "初级护身符"
|
||||
"text": "初级经验丹"
|
||||
},
|
||||
"usetype": 1,
|
||||
"color": 2,
|
||||
@ -372,11 +372,11 @@
|
||||
"img": "item_10000008",
|
||||
"intr": {
|
||||
"key": "item_item_intr_8",
|
||||
"text": "蕴含神秘力量的护身符，可以在守护者界面为守护者提供250经验值。"
|
||||
"text": "蕴含神秘力量的经验丹，可以在守护者界面为守护者提供250经验值。"
|
||||
},
|
||||
"describe": {
|
||||
"key": "item_item_describe_8",
|
||||
"text": "初级的护身符，守护者的道路由此开启。"
|
||||
"text": "初级的经验丹，守护者的道路由此开启。"
|
||||
},
|
||||
"dialogue": {
|
||||
"key": "item_item_dialogue_8",
|
||||
@ -395,7 +395,7 @@
|
||||
"id": "10000009",
|
||||
"name": {
|
||||
"key": "item_item_name_9",
|
||||
"text": "中级护身符"
|
||||
"text": "中级经验丹"
|
||||
},
|
||||
"usetype": 1,
|
||||
"color": 3,
|
||||
@ -421,11 +421,11 @@
|
||||
"img": "item_10000009",
|
||||
"intr": {
|
||||
"key": "item_item_intr_9",
|
||||
"text": "蕴含神秘力量的护身符，可以在守护者界面为守护者提供2000经验值。"
|
||||
"text": "蕴含神秘力量的经验丹，可以在守护者界面为守护者提供2000经验值。"
|
||||
},
|
||||
"describe": {
|
||||
"key": "item_item_describe_9",
|
||||
"text": "中级的护身符，通常给予那些战斗比较熟练的守护者。"
|
||||
"text": "中级的经验丹，通常给予那些战斗比较熟练的守护者。"
|
||||
},
|
||||
"dialogue": {
|
||||
"key": "item_item_dialogue_9",
|
||||
@ -444,7 +444,7 @@
|
||||
"id": "10000010",
|
||||
"name": {
|
||||
"key": "item_item_name_10",
|
||||
"text": "高级护身符"
|
||||
"text": "高级经验丹"
|
||||
},
|
||||
"usetype": 1,
|
||||
"color": 4,
|
||||
@ -470,15 +470,15 @@
|
||||
"img": "item_10000010",
|
||||
"intr": {
|
||||
"key": "item_item_intr_10",
|
||||
"text": "蕴含神秘力量的护身符，可以在守护者界面为守护者提供8000经验值。"
|
||||
"text": "蕴含神秘力量的经验丹，可以在守护者界面为守护者提供8000经验值。"
|
||||
},
|
||||
"describe": {
|
||||
"key": "item_item_describe_10",
|
||||
"text": "高级的护身符，常见于经历上千次战斗的守护者。"
|
||||
"text": "高级的经验丹，常见于经历上千次战斗的守护者。"
|
||||
},
|
||||
"dialogue": {
|
||||
"key": "item_item_dialogue_10",
|
||||
"text": "【你认为自己已经够强了————直到戴上这个之后。】"
|
||||
"text": "【你认为自己已经够强了————直到带上这个之后。】"
|
||||
},
|
||||
"sale": [
|
||||
{
|
||||
@ -19785,7 +19785,7 @@
|
||||
"n": 1000
|
||||
}
|
||||
],
|
||||
"gm": 1
|
||||
"gm": 0
|
||||
},
|
||||
{
|
||||
"id": "17040001",
|
||||
@ -19834,7 +19834,7 @@
|
||||
"n": 1000
|
||||
}
|
||||
],
|
||||
"gm": 0
|
||||
"gm": 1
|
||||
},
|
||||
{
|
||||
"id": "24010001",
|
||||
@ -20022,7 +20022,7 @@
|
||||
"n": 1000
|
||||
}
|
||||
],
|
||||
"gm": 1
|
||||
"gm": 0
|
||||
},
|
||||
{
|
||||
"id": "24021001",
|
||||
@ -20069,7 +20069,7 @@
|
||||
"n": 1000
|
||||
}
|
||||
],
|
||||
"gm": 1
|
||||
"gm": 0
|
||||
},
|
||||
{
|
||||
"id": "24031001",
|
||||
@ -20116,7 +20116,7 @@
|
||||
"n": 1000
|
||||
}
|
||||
],
|
||||
"gm": 1
|
||||
"gm": 0
|
||||
},
|
||||
{
|
||||
"id": "24041001",
|
||||
@ -20163,7 +20163,7 @@
|
||||
"n": 1000
|
||||
}
|
||||
],
|
||||
"gm": 1
|
||||
"gm": 0
|
||||
},
|
||||
{
|
||||
"id": "24012001",
|
||||
@ -20768,7 +20768,7 @@
|
||||
"n": 1000
|
||||
}
|
||||
],
|
||||
"gm": 1
|
||||
"gm": 0
|
||||
},
|
||||
{
|
||||
"id": "26000001",
|
||||
@ -20815,7 +20815,7 @@
|
||||
"n": 1001
|
||||
}
|
||||
],
|
||||
"gm": 1
|
||||
"gm": 0
|
||||
},
|
||||
{
|
||||
"id": "27000001",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -54,33 +54,5 @@
|
||||
"key": "pandamas_pandamas_buff_name_4",
|
||||
"text": "暴击抵抗增加2%"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1005,
|
||||
"buff_group": 1000001,
|
||||
"duration": "",
|
||||
"camp_restriction": 0,
|
||||
"occupational_restrictions": 0,
|
||||
"star_limit": 0,
|
||||
"buffid": 200000005,
|
||||
"p": 1667,
|
||||
"name": {
|
||||
"key": "pandamas_pandamas_buff_name_5",
|
||||
"text": "效果命中增加2%"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1006,
|
||||
"buff_group": 1000001,
|
||||
"duration": "",
|
||||
"camp_restriction": 0,
|
||||
"occupational_restrictions": 0,
|
||||
"star_limit": 0,
|
||||
"buffid": 200000006,
|
||||
"p": 1667,
|
||||
"name": {
|
||||
"key": "pandamas_pandamas_buff_name_6",
|
||||
"text": "效果抵抗增加2%"
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -1,4 +1,27 @@
|
||||
[
|
||||
{
|
||||
"id": "16010000",
|
||||
"sex": 0,
|
||||
"type": 1,
|
||||
"icon": "sbkp_js_nz",
|
||||
"playerhead": "tx_js_nz",
|
||||
"tujing": [
|
||||
107
|
||||
],
|
||||
"url": "100001",
|
||||
"tips": 10000,
|
||||
"resources": "Person/10000/25001M.prefab",
|
||||
"pvpAnimator": "",
|
||||
"mainq": "",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_1",
|
||||
"text": "陈旧服饰"
|
||||
},
|
||||
"txt": {
|
||||
"key": "playerinfor_playerinfor_overview_txt_1",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "16010101",
|
||||
"sex": 1,
|
||||
@ -11,10 +34,8 @@
|
||||
"url": "100001",
|
||||
"tips": 10000,
|
||||
"resources": "Person/10000/10000M.prefab",
|
||||
"vague": "Person/10000/10000MT.prefab",
|
||||
"pvpAnimator": "Person/10000/10000_MPvp.controller",
|
||||
"mainq": "Person/10000/10000M_q.prefab",
|
||||
"vagueq": "Person/10000/10000MT_q.prefab",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_1",
|
||||
"text": "陈旧服饰"
|
||||
@ -36,10 +57,8 @@
|
||||
"url": "200001",
|
||||
"tips": 10000,
|
||||
"resources": "Person/10000/10000W.prefab",
|
||||
"vague": "Person/10000/10000WT.prefab",
|
||||
"pvpAnimator": "Person/10000/10000_WPvp.controller",
|
||||
"mainq": "Person/10000/10000W_q.prefab",
|
||||
"vagueq": "Person/10000/10000WT_q.prefab",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_2",
|
||||
"text": "陈旧服饰"
|
||||
@ -61,10 +80,8 @@
|
||||
"url": "explore",
|
||||
"tips": 10000,
|
||||
"resources": "",
|
||||
"vague": "",
|
||||
"pvpAnimator": "",
|
||||
"mainq": "",
|
||||
"vagueq": "",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_3",
|
||||
"text": "陈述观念"
|
||||
@ -86,10 +103,8 @@
|
||||
"url": "explore",
|
||||
"tips": 10000,
|
||||
"resources": "",
|
||||
"vague": "",
|
||||
"pvpAnimator": "",
|
||||
"mainq": "",
|
||||
"vagueq": "",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_4",
|
||||
"text": "讲解原理"
|
||||
@ -111,10 +126,8 @@
|
||||
"url": "character_cardshow",
|
||||
"tips": 10000,
|
||||
"resources": "",
|
||||
"vague": "",
|
||||
"pvpAnimator": "",
|
||||
"mainq": "",
|
||||
"vagueq": "",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_5",
|
||||
"text": "虚无星空"
|
||||
@ -136,10 +149,8 @@
|
||||
"url": "character_cardshow",
|
||||
"tips": 10000,
|
||||
"resources": "",
|
||||
"vague": "",
|
||||
"pvpAnimator": "",
|
||||
"mainq": "",
|
||||
"vagueq": "",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_6",
|
||||
"text": "虚无星空"
|
||||
@ -161,10 +172,8 @@
|
||||
"url": "",
|
||||
"tips": 10000,
|
||||
"resources": "",
|
||||
"vague": "",
|
||||
"pvpAnimator": "",
|
||||
"mainq": "",
|
||||
"vagueq": "",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_7",
|
||||
"text": "头像框1"
|
||||
@ -186,10 +195,8 @@
|
||||
"url": "",
|
||||
"tips": 10000,
|
||||
"resources": "",
|
||||
"vague": "",
|
||||
"pvpAnimator": "",
|
||||
"mainq": "",
|
||||
"vagueq": "",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_8",
|
||||
"text": "头像框2"
|
||||
@ -211,10 +218,8 @@
|
||||
"url": "",
|
||||
"tips": 10000,
|
||||
"resources": "",
|
||||
"vague": "",
|
||||
"pvpAnimator": "",
|
||||
"mainq": "",
|
||||
"vagueq": "",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_9",
|
||||
"text": "头像框3"
|
||||
@ -236,10 +241,8 @@
|
||||
"url": "",
|
||||
"tips": 10000,
|
||||
"resources": "",
|
||||
"vague": "",
|
||||
"pvpAnimator": "",
|
||||
"mainq": "",
|
||||
"vagueq": "",
|
||||
"name": {
|
||||
"key": "playerinfor_playerinfor_overview_name_10",
|
||||
"text": "头像框4"
|
||||
|
||||
@ -10,28 +10,48 @@
|
||||
"matewin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"matefail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankwin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankfail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
@ -57,29 +77,49 @@
|
||||
"matewin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 12
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"matefail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 12
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankwin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 12
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankfail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 12
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"win_value": 30,
|
||||
@ -104,29 +144,49 @@
|
||||
"matewin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 14
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"matefail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 14
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankwin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 14
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankfail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 14
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"win_value": 30,
|
||||
@ -151,29 +211,49 @@
|
||||
"matewin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 16
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"matefail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 16
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankwin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 16
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankfail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 16
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"win_value": 30,
|
||||
@ -198,29 +278,49 @@
|
||||
"matewin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 18
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"matefail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 18
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankwin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 18
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankfail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 18
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"win_value": 30,
|
||||
@ -245,29 +345,49 @@
|
||||
"matewin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 20
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"matefail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 20
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankwin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 20
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankfail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 20
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"win_value": 30,
|
||||
@ -292,29 +412,49 @@
|
||||
"matewin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 22
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"matefail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 22
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankwin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 22
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankfail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 22
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"win_value": 30,
|
||||
@ -339,29 +479,49 @@
|
||||
"matewin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 22
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"matefail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 22
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankwin_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 22
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"rankfail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 22
|
||||
"t": "gold",
|
||||
"n": 200000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"win_value": 30,
|
||||
|
||||
@ -320,7 +320,7 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"CommandScene",
|
||||
"主线入口_原石",
|
||||
"20010_骇客蛛_1",
|
||||
"905"
|
||||
],
|
||||
"event": [
|
||||
@ -329,13 +329,28 @@
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 10015,
|
||||
"heroid": 45002,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"CommandScene",
|
||||
"20010_梅林",
|
||||
"905"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10021
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 10018,
|
||||
"heroid": 25001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"CommandScene",
|
||||
"20010_熊猫_1",
|
||||
"主线入口_原石",
|
||||
"905"
|
||||
],
|
||||
"event": [
|
||||
@ -350,7 +365,7 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"20020_熊猫_船甲板",
|
||||
"梅林",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
@ -365,7 +380,7 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"20020_小怪_船甲板",
|
||||
"20020_小怪_船甲板1",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
@ -375,17 +390,17 @@
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 100108,
|
||||
"id": 100105,
|
||||
"heroid": 25001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"20020_熊猫_船甲板",
|
||||
"20020_小怪_船甲板2",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10050
|
||||
1,
|
||||
102
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -395,12 +410,12 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"熊猫_圣桃树_常驻",
|
||||
"20060-乌龟大师",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10060
|
||||
10041
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -410,42 +425,12 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"恐惧碎片调查点1",
|
||||
"功能入口-招募",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10070
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 10025,
|
||||
"heroid": 44004,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"恐惧碎片调查点2",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10080
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 10026,
|
||||
"heroid": 25001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"恐惧碎片调查点3",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10090
|
||||
100411
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -470,12 +455,12 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"邦尼兔_圣桃树_常驻",
|
||||
"功能入口-招募",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10100
|
||||
10042
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -485,70 +470,27 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"邦尼兔_圣桃树_常驻",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
1,
|
||||
102
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 10038,
|
||||
"heroid": 24004,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"熊猫_圣桃树_常驻",
|
||||
"20030_扫地点1号",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10130
|
||||
10043
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 10040,
|
||||
"heroid": 25001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"熊猫_圣桃树_常驻",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10130
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 10044,
|
||||
"id": 10035,
|
||||
"heroid": 24004,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"邦尼兔_圣桃树_常驻",
|
||||
"20030_扫地点2号",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
1,
|
||||
103
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 10048,
|
||||
"heroid": 25001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
0
|
||||
2,
|
||||
10044
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -558,12 +500,12 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"熊猫_圣桃树_常驻",
|
||||
"20020_阿宝_常驻",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10130
|
||||
10060
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -597,6 +539,96 @@
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 100321,
|
||||
"heroid": 45001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"20020_阿宝_常驻",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10070
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 100322,
|
||||
"heroid": 45001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"功能入口-招募",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10080
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 100328,
|
||||
"heroid": 45001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"功能入口-招募",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10142
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 200331,
|
||||
"heroid": 45001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"功能入口-招募",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10090
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 200332,
|
||||
"heroid": 45001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"功能入口-烹饪",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10100
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 200338,
|
||||
"heroid": 45001,
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"功能入口-烹饪",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10110
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 100421,
|
||||
"heroid": 35002,
|
||||
|
||||
@ -27,6 +27,6 @@
|
||||
"key": "repeat_repeat_all_cdtxt_01",
|
||||
"text": "地面干净了不少。"
|
||||
},
|
||||
"cdtime": 18000
|
||||
"cdtime": 10
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -12018,7 +12018,7 @@
|
||||
"key": "skill_skill_buff_Desc_391000099",
|
||||
"text": "减少40%受到的暴击伤害和会心伤害。"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"BuffType": 135,
|
||||
"EffectArgu": [],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
@ -12049,7 +12049,7 @@
|
||||
"key": "skill_skill_buff_Desc_391000100",
|
||||
"text": "金蛋内置嘲讽效果，共3点血量，每次受到攻击强制扣除1点血量，血量为0或回合结束后金蛋破碎目标解除金蛋状态。根据金蛋剩余血量按对应百分比回复蛋先生血量。"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"BuffType": 139,
|
||||
"EffectArgu": [],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
@ -12081,7 +12081,7 @@
|
||||
"key": "skill_skill_buff_Desc_391000101",
|
||||
"text": "造成伤害增加40%，每次攻击时有20%减少3技能1回合冷却。有50%的概率立即获得回合"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"BuffType": 138,
|
||||
"EffectArgu": [],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
@ -12113,7 +12113,7 @@
|
||||
"key": "skill_skill_buff_Desc_391000102",
|
||||
"text": "1，2技能变化，效果命中+100，造成伤害前添加2回合收到伤害增加"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"BuffType": 140,
|
||||
"EffectArgu": [],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
@ -12181,7 +12181,7 @@
|
||||
"key": "skill_skill_buff_Desc_391000104",
|
||||
"text": "友方单位受到攻击时有40%概率触发反击。"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"BuffType": 136,
|
||||
"EffectArgu": [],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
@ -12246,7 +12246,7 @@
|
||||
"key": "skill_skill_buff_Desc_391000106",
|
||||
"text": "受到治疗效果降低50%，造成伤害降低30%。"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"BuffType": 137,
|
||||
"EffectArgu": [],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
@ -12266,5 +12266,36 @@
|
||||
"buffpos": "",
|
||||
"forbidFloat": 0,
|
||||
"ReplaceBuffID": 0
|
||||
},
|
||||
{
|
||||
"Id": 391000107,
|
||||
"Name": {
|
||||
"key": "skill_skill_buff_Name_391000107",
|
||||
"text": "效果提升"
|
||||
},
|
||||
"Desc": {
|
||||
"key": "skill_skill_buff_Desc_391000107",
|
||||
"text": "【攻击提升】、【防御提升】、【速度提升】效果提升35%。"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
"Priority": 0,
|
||||
"NotOverlay": 0,
|
||||
"OverlayTimes": 1,
|
||||
"SameID": false,
|
||||
"golbalbufficon": "",
|
||||
"buffIcon": "",
|
||||
"buffeffect": "",
|
||||
"buffpos": "",
|
||||
"forbidFloat": 0,
|
||||
"ReplaceBuffID": 0
|
||||
}
|
||||
]
|
||||
@ -9319,5 +9319,45 @@
|
||||
235012212,
|
||||
235012213
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 445004111,
|
||||
"When": 16,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "SkillPos=1",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"DpsCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 300,
|
||||
"PasCorrection": 0,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimesInRoundByRole": 0,
|
||||
"MaxEmitTimes": 0,
|
||||
"MaxEmitTimesInRound": 1,
|
||||
"Callback": [
|
||||
145004211
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 445004221,
|
||||
"When": 16,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "SkillPos=2",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"DpsCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 200,
|
||||
"PasCorrection": 0,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimesInRoundByRole": 0,
|
||||
"MaxEmitTimes": 0,
|
||||
"MaxEmitTimesInRound": 1,
|
||||
"Callback": [
|
||||
145004311
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -4,7 +4,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 1,
|
||||
"time": 20,
|
||||
"count": 3,
|
||||
"count": 30,
|
||||
"monster_id": 1011,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -13,7 +13,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 2,
|
||||
"time": 20,
|
||||
"count": 3,
|
||||
"count": 20,
|
||||
"monster_id": 1011,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -22,7 +22,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 2,
|
||||
"time": 20,
|
||||
"count": 2,
|
||||
"count": 10,
|
||||
"monster_id": 1021,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -31,7 +31,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 3,
|
||||
"time": 20,
|
||||
"count": 5,
|
||||
"count": 20,
|
||||
"monster_id": 1011,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -40,7 +40,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 3,
|
||||
"time": 20,
|
||||
"count": 1,
|
||||
"count": 10,
|
||||
"monster_id": 1021,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -49,7 +49,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 4,
|
||||
"time": 20,
|
||||
"count": 3,
|
||||
"count": 30,
|
||||
"monster_id": 1011,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -58,7 +58,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 4,
|
||||
"time": 20,
|
||||
"count": 2,
|
||||
"count": 20,
|
||||
"monster_id": 1021,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -67,7 +67,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 5,
|
||||
"time": 20,
|
||||
"count": 5,
|
||||
"count": 30,
|
||||
"monster_id": 1011,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -76,7 +76,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 5,
|
||||
"time": 20,
|
||||
"count": 2,
|
||||
"count": 20,
|
||||
"monster_id": 1021,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -85,7 +85,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 6,
|
||||
"time": 20,
|
||||
"count": 7,
|
||||
"count": 50,
|
||||
"monster_id": 1011,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -94,7 +94,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 6,
|
||||
"time": 20,
|
||||
"count": 2,
|
||||
"count": 20,
|
||||
"monster_id": 1021,
|
||||
"hp_multiple": 1000
|
||||
},
|
||||
@ -103,7 +103,7 @@
|
||||
"copy_id": 1,
|
||||
"num": 7,
|
||||
"time": 20,
|
||||
"count": 5,
|
||||
"count": 20,
|
||||
"monster_id": 3011,
|
||||
"hp_multiple": 1000
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
"text": "向前方发射冲击能量打击敌人"
|
||||
},
|
||||
"sak": 20,
|
||||
"atk_speed": 2000,
|
||||
"atk_speed": 200,
|
||||
"weapon_type": 1,
|
||||
"bulletPrefab": "",
|
||||
"fly_speed": 10,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -69,7 +69,9 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype151, 1))
|
||||
this.module.WriteUserLog(session.GetUserId(), "AcademyReceiveReq", level.Award)
|
||||
})
|
||||
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "receive", &pb.AcademyReceiveResp{Issucc: true})
|
||||
return
|
||||
|
||||
@ -65,6 +65,10 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT
|
||||
return
|
||||
}
|
||||
this.module.DispenseRes(session, level.Award, true)
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "AcademyTeachingReceiveReq", level.Award)
|
||||
})
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "teachingreceive", &pb.AcademyTeachingReceiveResp{Issucc: true})
|
||||
return
|
||||
|
||||
@ -75,5 +75,9 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AddRechargeRecei
|
||||
"record": info.Record,
|
||||
})
|
||||
session.SendMsg(string(this.module.GetType()), "receive", &pb.AddRechargeReceiveResp{Id: req.Id, Award: award})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "AddRechargeReceiveReq", award)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -78,5 +78,8 @@ func (this *apiComp) ReceiveAll(session comm.IUserSession, req *pb.AddRechargeRe
|
||||
"record": info.Record,
|
||||
})
|
||||
session.SendMsg(string(this.module.GetType()), "receiveall", &pb.AddRechargeReceiveAllResp{Record: info.Record, Award: award})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "AddRechargeReceiveAllReq", award)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -97,5 +97,9 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "buy", &pb.MoonfantasyBuyResp{Issucc: true, BattleNum: info.Buynum})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "MoonfantasyBuyReq", []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}})
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -27,6 +27,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
|
||||
err error
|
||||
iswin bool
|
||||
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
|
||||
bReward bool
|
||||
)
|
||||
if errdata = this.ChallengeRewardCheck(session, req); errdata != nil {
|
||||
return
|
||||
@ -64,6 +65,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
|
||||
if errdata = this.module.DispenseRes(session, reward.WinReward, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
bReward = true
|
||||
if req.Revengeid != "" {
|
||||
redstate = pb.BattleRecordState_RevengeSucceeded
|
||||
bulestate = pb.BattleRecordState_DefendLost
|
||||
@ -286,6 +288,9 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.ModuleBuried.TriggerBuried(session, tasks...)
|
||||
if bReward {
|
||||
this.module.WriteUserLog(session.GetUserId(), "ArenaChallengeRewardReq", reward.WinReward)
|
||||
}
|
||||
})
|
||||
|
||||
return
|
||||
|
||||
@ -26,6 +26,7 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa
|
||||
info *pb.DBArenaUser
|
||||
iswin bool
|
||||
err error
|
||||
atno []*pb.UserAtno
|
||||
)
|
||||
|
||||
if errdata = this.PlotRewardCheck(session, req); errdata != nil {
|
||||
@ -65,11 +66,11 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa
|
||||
}
|
||||
|
||||
if info.Npc[req.Pid].Index != 0 {
|
||||
if errdata = this.module.DispenseRes(session, npc.NpcReward, true); errdata != nil {
|
||||
if errdata, atno = this.module.DispenseAtno(session, npc.NpcReward, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
if errdata = this.module.DispenseRes(session, npc.NewNpcReward, true); errdata != nil {
|
||||
if errdata, atno = this.module.DispenseAtno(session, npc.NewNpcReward, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
@ -95,5 +96,9 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa
|
||||
Issucc: true,
|
||||
Npc: info.Npc,
|
||||
})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "ArenaPlotRewardReq", atno)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -72,5 +72,8 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (er
|
||||
Data: list,
|
||||
Res: respRes,
|
||||
})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "AtlasAwardReq", respRes)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -115,6 +115,9 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
|
||||
if errdata = this.module.DispenseRes(session, addRes, true); errdata != nil {
|
||||
this.module.Errorf("获得虚拟币失败:%v", errdata)
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "troll sell", addRes)
|
||||
})
|
||||
this.module.ArrayBag(caravan)
|
||||
|
||||
// 统计 收益
|
||||
@ -228,6 +231,13 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
|
||||
}}, true); errdata != nil {
|
||||
this.module.Errorf("获得虚拟币失败:%v", errdata)
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "troll buy", []*cfg.Gameatn{{
|
||||
A: "attr",
|
||||
T: "merchantmoney",
|
||||
N: addScore,
|
||||
}})
|
||||
})
|
||||
}
|
||||
|
||||
update["items"] = caravan.Items
|
||||
|
||||
@ -220,6 +220,10 @@ func (this *Caravan) InitCaravanTicket(session comm.IUserSession, conf *cfg.Game
|
||||
res = append(res, conf.Tickettop)
|
||||
res = append(res, conf.Moneynumtop)
|
||||
errdata = this.DispenseRes(session, res, true) // 推送门票和虚拟币资源
|
||||
|
||||
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(session.GetUserId(), "InitCaravanTicket", res)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -382,6 +386,9 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid ...int32) {
|
||||
this.Errorf("Caravan DispenseRes err:%v", conf.Reword)
|
||||
}
|
||||
session.SendMsg(string(this.GetType()), "taskcomplete", resp)
|
||||
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(session.GetUserId(), "TaskComplete", conf.Reword)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -23,6 +23,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda
|
||||
condis []*pb.ConIProgress
|
||||
ok bool
|
||||
err error
|
||||
reward []*pb.UserAssets
|
||||
)
|
||||
if errdata = this.AskCheck(session, req); errdata != nil {
|
||||
return
|
||||
@ -97,6 +98,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda
|
||||
N: v.N,
|
||||
}
|
||||
}
|
||||
reward = append(reward, atns...)
|
||||
pitem.Mainaward = atns
|
||||
}
|
||||
|
||||
@ -132,6 +134,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda
|
||||
N: v.N,
|
||||
}
|
||||
}
|
||||
reward = append(reward, atns...)
|
||||
pitem.Peraward = atns
|
||||
}
|
||||
|
||||
@ -148,5 +151,9 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "ask", &pb.CombatAskResp{Level: pitem})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "CombatAskReq", reward)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -99,7 +99,12 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "CombatChallengeReceiveReq", atns)
|
||||
})
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "challengereceive", &pb.CombatChallengeReceiveResp{Level: req.Level, Manster: req.Manster, Atns: atns})
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -111,5 +111,8 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "drop", &pb.CombatDropResp{Level: req.Level, Atns: atns})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "CombatDropReq", atns)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
func (a *apiComp) AutoreceiveCheck(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (errdata *pb.ErrorData) {
|
||||
@ -11,12 +12,13 @@ func (a *apiComp) AutoreceiveCheck(session comm.IUserSession, req *pb.DispatchAu
|
||||
}
|
||||
|
||||
func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (errdata *pb.ErrorData) {
|
||||
var res []*cfg.Gameatn
|
||||
rsp := &pb.DispatchAutoReceiveResp{}
|
||||
d := a.module.modelDispatch.getDBDispatch(session.GetUserId())
|
||||
if d == nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DataNotFound,
|
||||
Title: pb.ErrorCode_DataNotFound.ToString(),
|
||||
Code: pb.ErrorCode_DataNotFound,
|
||||
Title: pb.ErrorCode_DataNotFound.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -51,19 +53,25 @@ func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoRec
|
||||
if err != nil {
|
||||
break
|
||||
}
|
||||
a.module.DispenseRes(session, gd.Reward, true)
|
||||
|
||||
//a.module.DispenseRes(session, gd.Reward, true)
|
||||
res = append(res, gd.Reward...)
|
||||
rs := &pb.DispatchTaskRsp{
|
||||
TaskId: t.TaskId,
|
||||
}
|
||||
if t.Exaward {
|
||||
rs.Exaward = t.Exaward
|
||||
a.module.DispenseRes(session, gd.Rewardex, true)
|
||||
res = append(res, gd.Rewardex...)
|
||||
//a.module.DispenseRes(session, gd.Rewardex, true)
|
||||
}
|
||||
rss = append(rss, rs)
|
||||
}
|
||||
a.module.DispenseRes(session, res, true)
|
||||
|
||||
rsp.Task = rss
|
||||
session.SendMsg(string(a.module.GetType()), "autoreceive", rsp)
|
||||
|
||||
go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
a.module.WriteUserLog(session.GetUserId(), "DispatchAutoReceiveReq", res)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -18,8 +18,8 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (
|
||||
d := a.module.modelDispatch.getDBDispatch(session.GetUserId())
|
||||
if d == nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DataNotFound,
|
||||
Title: pb.ErrorCode_DataNotFound.ToString(),
|
||||
Code: pb.ErrorCode_DataNotFound,
|
||||
Title: pb.ErrorCode_DataNotFound.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -67,6 +67,10 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (
|
||||
add := limit - int32(left)
|
||||
atn := &cfg.Gameatn{A: "item", T: itemId, N: add}
|
||||
a.module.DispenseRes(session, []*cfg.Gameatn{atn}, true)
|
||||
|
||||
go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
a.module.WriteUserLog(session.GetUserId(), "恢复门票", atn)
|
||||
})
|
||||
}
|
||||
}
|
||||
//周任务重置
|
||||
|
||||
@ -4,6 +4,7 @@ import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
// 领取派遣奖励
|
||||
@ -19,6 +20,7 @@ func (a *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DispatchReceiv
|
||||
}
|
||||
|
||||
func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (errdata *pb.ErrorData) {
|
||||
var res []*cfg.Gameatn
|
||||
if errdata = a.ReceiveCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
@ -65,12 +67,13 @@ func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq)
|
||||
if err != nil {
|
||||
|
||||
}
|
||||
a.module.DispenseRes(session, gd.Reward, true)
|
||||
|
||||
//a.module.DispenseRes(session, gd.Reward, true)
|
||||
res = append(res, gd.Reward...)
|
||||
if oldTask.Exaward {
|
||||
a.module.DispenseRes(session, gd.Rewardex, true)
|
||||
res = append(res, gd.Rewardex...)
|
||||
// a.module.DispenseRes(session, gd.Rewardex, true)
|
||||
}
|
||||
|
||||
a.module.DispenseRes(session, res, true)
|
||||
//记录任务使用次数
|
||||
if d.Completecount == nil {
|
||||
d.Completecount = make(map[int32]int32)
|
||||
@ -90,5 +93,8 @@ func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq)
|
||||
}
|
||||
|
||||
session.SendMsg(string(a.module.GetType()), "receive", rsp)
|
||||
go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
a.module.WriteUserLog(session.GetUserId(), "DispatchReceiveReq", res)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@ package dispatch
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (errdata *pb.ErrorData) {
|
||||
@ -16,6 +17,9 @@ func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWee
|
||||
}
|
||||
|
||||
func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
res []*cfg.Gameatn
|
||||
)
|
||||
if errdata = a.WeekreciveCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
@ -24,8 +28,8 @@ func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReci
|
||||
d := a.module.modelDispatch.getDBDispatch(session.GetUserId())
|
||||
if d == nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DataNotFound,
|
||||
Title: pb.ErrorCode_DataNotFound.ToString(),
|
||||
Code: pb.ErrorCode_DataNotFound,
|
||||
Title: pb.ErrorCode_DataNotFound.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -44,13 +48,20 @@ func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReci
|
||||
}
|
||||
return
|
||||
}
|
||||
a.module.DispenseRes(session, v.G, true)
|
||||
res = append(res, v.G...)
|
||||
// a.module.DispenseRes(session, v.G, true)
|
||||
rsp.Idx = req.Idx
|
||||
break
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if len(res) > 0 {
|
||||
a.module.DispenseRes(session, res, true)
|
||||
go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
a.module.WriteUserLog(session.GetUserId(), "DispatchWeekReciveReq", res)
|
||||
})
|
||||
}
|
||||
session.SendMsg(string(a.module.GetType()), "weekrecive", rsp)
|
||||
return
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@ package enchant
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
//参数校验
|
||||
@ -23,6 +24,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha
|
||||
mapData map[string]interface{}
|
||||
bWin bool // 战斗是否胜利
|
||||
score int32 // 通关获得分数
|
||||
res []*cfg.Gameatn
|
||||
)
|
||||
mapData = make(map[string]interface{}, 0)
|
||||
// reward = make([]*cfg.Gameatn, 0)
|
||||
@ -89,12 +91,18 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha
|
||||
if score >= v.ScoreLow && score <= v.ScoreUp {
|
||||
for _, v1 := range v.RewardDrop {
|
||||
reward := this.module.ModuleTools.GetGroupDataByLottery(v1, userinfo.Vip, userinfo.Lv)
|
||||
if errdata = this.module.DispenseRes(session, reward, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
res = append(res, reward...)
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(res) > 0 {
|
||||
if errdata = this.module.DispenseRes(session, res, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "EnchantChallengeOverReq", res)
|
||||
})
|
||||
}
|
||||
|
||||
mapData["bossTime"] = enchant.BossTime
|
||||
mapData["boss"] = enchant.Boss
|
||||
|
||||
@ -60,5 +60,8 @@ func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewar
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "getreward", rsp)
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "FriendGetrewardReq", globalConf.FriendPeize)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -133,6 +133,7 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda
|
||||
// 赠送X次友情点
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype11, 1))
|
||||
this.module.WriteUserLog(session.GetUserId(), "FriendGetrewardReq", res)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -61,5 +61,8 @@ func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetAct
|
||||
Atlas: _gourmet.Atlas,
|
||||
})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "GourmetActivateAtlasReq", conf.Unlockreward)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -100,6 +100,7 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate
|
||||
})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype150, 1))
|
||||
this.module.WriteUserLog(session.GetUserId(), "GourmetCreateFoodReq", atn)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -205,5 +205,8 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
|
||||
Score: score.Id,
|
||||
Boosticket: member.Boosticket,
|
||||
})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "GuildGveChallengeFinishReq", award)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -71,5 +71,9 @@ func (this *apiComp) Roulette(session comm.IUserSession, req *pb.GuildGveRoulett
|
||||
go this.module.modelUnionroulette.roulettechangePush(req.Guildid, session.GetUserId(), user.Name, confs[index].Id, award)
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "roulette", &pb.GuildGveRouletteResp{Cid: confs[index].Id, Award: award})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "GuildGveRouletteReq", confs[index].Reward)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -116,6 +116,9 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
|
||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype115, 1, _hero.Star))
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.ModuleBuried.TriggerBuried(session, tasks...)
|
||||
if len(starConf.Starup) > 0 {
|
||||
this.module.WriteUserLog(session.GetUserId(), "HeroStrengthenUpStarReq", starConf.Starup)
|
||||
}
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -72,6 +72,9 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe
|
||||
if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil {
|
||||
this.module.Errorf("DispenseRes err,uid:%s,item:%v", session.GetUserId(), res)
|
||||
} // 返还升级的天赋点数
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "HeroTalentResetReq", res)
|
||||
})
|
||||
}
|
||||
|
||||
if len(_talent.Talent) > 0 {
|
||||
|
||||
@ -867,6 +867,9 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c
|
||||
}
|
||||
if len(res) > 0 { // 资源统一发放
|
||||
this.module.DispenseRes(session, res, true)
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "create hero", res)
|
||||
})
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@ -107,5 +107,9 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.HeroTaskReceiveR
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "receive", &pb.HeroTaskReceiveResp{Hero: req.Hero, Stage: req.Stage, Award: award})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "HeroTaskReceiveReq", award)
|
||||
})
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -70,5 +70,9 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq)
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "reset", &pb.HoroscopeResetResp{Issucc: true, Info: info, Award: consume})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "HoroscopeResetReq", res)
|
||||
})
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -69,5 +69,10 @@ func (this *apiComp) PotionSynthesis(session comm.IUserSession, req *pb.ItemsPot
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "potionsynthesis", &pb.ItemsPotionSynthesisResp{Succ: true, Id: req.Id, Num: req.Num})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "ItemsPotionSynthesisReq", give)
|
||||
})
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -86,5 +86,9 @@ func (this *apiComp) Sellinbulk(session comm.IUserSession, req *pb.ItemsSellinbu
|
||||
}
|
||||
this.module.itemsChangePush(session, items)
|
||||
session.SendMsg(string(this.module.GetType()), "sellitem", &pb.ItemsSellinbulkResp{Grids: req.Grids, Amount: req.Amount, Issucc: issucc})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "ItemsSellinbulkReq", sale)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -544,6 +544,10 @@ func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (inf
|
||||
"lasttimeunifiedticket": info.Lasttimeunifiedticket,
|
||||
"recovertimeunifiedticket": info.Recovertimeunifiedticket,
|
||||
})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "buyTicket", res)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -599,6 +603,9 @@ func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (errdata *p
|
||||
}
|
||||
this.module.DispenseRes(session, []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: ticketNum}}, true)
|
||||
info.Recovertimeunifiedticket = time.Unix(info.Recovertimeunifiedticket, 0).Add(time.Duration(ticketNum) * time.Minute).Unix()
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "recoverTicket", []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: ticketNum}})
|
||||
})
|
||||
}
|
||||
}
|
||||
this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
|
||||
|
||||
@ -103,5 +103,9 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq
|
||||
"tasks": dtask.Tasks,
|
||||
})
|
||||
session.SendMsg(string(this.module.GetType()), "receive", &pb.KFTaskReceiveResp{Id: req.Id, Award: award})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "KFTaskReceiveReq", award)
|
||||
})
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -68,5 +68,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceive
|
||||
UserAssets: utils.ConvertReward(conf.Reward...),
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), LinestorySubTypeReceive, rsp)
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "LinestoryReceiveReq", conf.Reward)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ func (this *apiComp) GetUserMailAttachmentCheck(session comm.IUserSession, req *
|
||||
|
||||
// 领取附件
|
||||
func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (errdata *pb.ErrorData) {
|
||||
|
||||
res := make([]*cfg.Gameatn, 0)
|
||||
if errdata = this.GetUserMailAttachmentCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
@ -40,7 +40,7 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma
|
||||
}
|
||||
if _data, err := this.module.modelMail.MailGetMailAttachment(req.ObjID); err == nil {
|
||||
if len(_data) > 0 {
|
||||
res := make([]*cfg.Gameatn, 0)
|
||||
|
||||
for _, v := range _data {
|
||||
d := &cfg.Gameatn{
|
||||
A: v.A,
|
||||
@ -59,6 +59,10 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "getusermailattachment", &pb.MailGetUserMailAttachmentResp{Mail: mail})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "MailGetUserMailAttachmentReq", res)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -80,6 +80,10 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
|
||||
session.SendMsg(string(this.module.GetType()), "challengeover", &pb.MainlineChallengeOverResp{
|
||||
Level: req.Level,
|
||||
}) // 数据推送
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "MainlineChallengeOverReq false", conf.PsConsume)
|
||||
})
|
||||
return
|
||||
}
|
||||
// 评星规则
|
||||
|
||||
@ -80,7 +80,7 @@ func (this *apiComp) ShopBuy(session comm.IUserSession, req *pb.MainlineShopBuyR
|
||||
return
|
||||
}
|
||||
if errdata, atno = this.module.DispenseAtno(session, shopConf.Itemsell, true); errdata != nil {
|
||||
this.module.DispenseRes(session, shopConf.Need, true)
|
||||
this.module.DispenseRes(session, shopConf.Need, true) // ?????
|
||||
return
|
||||
}
|
||||
this.module.modelShop.updateMainlineShopData(session.GetUserId(), info)
|
||||
|
||||
@ -43,12 +43,19 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyRecei
|
||||
if errdata = this.module.ConsumeRes(session, boss.PsMg, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "MoonfantasyReceiveReq", boss.PsMg)
|
||||
})
|
||||
return
|
||||
} else {
|
||||
if errdata = this.module.ConsumeRes(session, boss.PsConsume, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
this.module.DispenseRes(session, boss.Prize, true)
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "MoonfantasyReceiveReq", boss.Prize)
|
||||
})
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "receive", &pb.MoonfantasyReceiveResp{Issucc: true})
|
||||
|
||||
@ -3,6 +3,7 @@ package oldtimes
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.OldtimesReceiveReq) (errdata *pb.ErrorData) {
|
||||
@ -16,6 +17,9 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.OldtimesRec
|
||||
}
|
||||
|
||||
func (this *apiComp) Receive(session comm.IUserSession, req *pb.OldtimesReceiveReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
res []*cfg.Gameatn
|
||||
)
|
||||
if errdata = this.ReceiveCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
@ -47,7 +51,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.OldtimesReceiveR
|
||||
return
|
||||
}
|
||||
if conf, ok := gltl.GetDataMap()[req.ChapterId]; ok {
|
||||
this.module.DispenseRes(session, conf.Reward, true)
|
||||
res = append(res, conf.Reward...)
|
||||
//this.module.DispenseRes(session, conf.Reward, true)
|
||||
}
|
||||
break
|
||||
}
|
||||
@ -55,6 +60,13 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.OldtimesReceiveR
|
||||
}
|
||||
}
|
||||
|
||||
if len(res) > 0 {
|
||||
this.module.DispenseRes(session, res, true)
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "OldtimesReceiveReq", res)
|
||||
})
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "receive", rsp)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -192,6 +192,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypePagoda, conf.Key)
|
||||
this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype168, pagoda.Data[conf.Tab], conf.Tab))
|
||||
this.module.WriteUserLog(session.GetUserId(), "PagodaChallengeOverReq", conf.Reward)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -142,6 +142,9 @@ func (this *modelActivityComp) deliverybyid(session comm.IUserSession, id int32)
|
||||
if errdata = this.module.DispenseRes(session, conf.Item, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "deliverybyid", conf.Item)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -206,5 +209,8 @@ func (this *modelActivityComp) delivery(session comm.IUserSession, pid string) (
|
||||
if errdata = this.module.DispenseRes(session, conf.Item, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "delivery", conf.Item)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -102,6 +102,9 @@ func (this *modelDailyComp) deliverybyid(session comm.IUserSession, id int32) (e
|
||||
if errdata = this.module.DispenseRes(session, conf.Item, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "deliverybyid", conf.Item)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -150,5 +153,8 @@ func (this *modelDailyComp) delivery(session comm.IUserSession, pid string) (err
|
||||
if errdata = this.module.DispenseRes(session, conf.Item, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "delivery", conf.Item)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -208,6 +208,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery
|
||||
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.ModuleHero.RechargeMoney(args.Uid, args.Price)
|
||||
this.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype229, 1, conf.Pid))
|
||||
this.WriteUserLog(session.GetUserId(), "Rpc_ModulePayDelivery", res)
|
||||
})
|
||||
return
|
||||
}
|
||||
@ -314,7 +315,10 @@ func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string,
|
||||
return
|
||||
}
|
||||
}
|
||||
go this.ModuleHero.RechargeMoney(session.GetUserId(), conf.Amount)
|
||||
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(session.GetUserId(), "ModulePayDelivery", res)
|
||||
this.ModuleHero.RechargeMoney(session.GetUserId(), conf.Amount)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@ package practice
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
// 参数校验
|
||||
@ -19,6 +20,7 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq
|
||||
pillar *pb.DBPracticePillar
|
||||
filed string
|
||||
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
|
||||
res []*cfg.Gameatn
|
||||
)
|
||||
if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
@ -65,7 +67,8 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq
|
||||
}
|
||||
return
|
||||
} else {
|
||||
if errdata = this.module.DispenseRes(session, pillarconfigure.PhotoGuideUnlocking, true); errdata != nil {
|
||||
res = append(res, pillarconfigure.PhotoGuideUnlocking...)
|
||||
if errdata = this.module.DispenseRes(session, res, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
@ -78,6 +81,7 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.ModuleBuried.TriggerBuried(session, tasks...)
|
||||
this.module.WriteUserLog(session.GetUserId(), "PracticeUnLockReq", res)
|
||||
})
|
||||
|
||||
return
|
||||
|
||||
@ -192,6 +192,9 @@ func (this *Privilege) Delivery(session comm.IUserSession, cId string) (errdata
|
||||
}
|
||||
// 推送
|
||||
session.SendMsg(string(this.GetType()), PrivilegeBuyYuekaResp, &pb.PrivilegeBuyYuekaResp{Data: list})
|
||||
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(session.GetUserId(), "PrivilegeBuyYuekaReq", items)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -223,6 +226,9 @@ func (this *Privilege) RenewPrivilegeCard(session comm.IUserSession, cId string)
|
||||
break
|
||||
}
|
||||
session.SendMsg(string(this.GetType()), PrivilegeBuyYuekaResp, &pb.PrivilegeGetListResp{Data: list})
|
||||
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(session.GetUserId(), "PrivilegeGetListReq", conf.DisposableReward)
|
||||
})
|
||||
} else {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_PrivilegeRenewTime,
|
||||
|
||||
@ -96,6 +96,9 @@ func (this *PushGiftbag) Delivery(session comm.IUserSession, pid string) (errdat
|
||||
"item": info.Item,
|
||||
})
|
||||
session.SendMsg(string(this.GetType()), "chanage", &pb.PushGiftbagChanagePush{Item: info.Item})
|
||||
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(session.GetUserId(), "PushGiftbagChanagePush", conf.Lbid)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -92,6 +92,9 @@ func (this *apiComp) Answer(session comm.IUserSession, req *pb.QuestionnaireAnsw
|
||||
})
|
||||
}
|
||||
this.module.DispenseRes(session, groupconfig.Reward, true)
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "QuestionnaireAnswerReq", groupconfig.Reward)
|
||||
})
|
||||
}
|
||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype203, 1, req.Group))
|
||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype204, 1))
|
||||
@ -106,10 +109,10 @@ func (this *apiComp) Answer(session comm.IUserSession, req *pb.QuestionnaireAnsw
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "answer", &pb.QuestionnaireAnswerResp{Info: info.Group[req.Group], Group: req.Group, Complete: finish, Award: award})
|
||||
|
||||
if len(tasks) > 0 {
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
if len(tasks) > 0 {
|
||||
this.module.ModuleBuried.TriggerBuried(session, tasks...)
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -124,6 +124,9 @@ func (this *Reputation) Upgrade(session comm.IUserSession, raceType int32, fv in
|
||||
if err := this.modelReputation.updateDBReputation(uid, update); err == nil {
|
||||
this.DispenseRes(session, []*cfg.Gameatn{reward}, false)
|
||||
}
|
||||
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(session.GetUserId(), "ReputationUpgrade", reward)
|
||||
})
|
||||
}
|
||||
|
||||
return c.ReputationLv
|
||||
|
||||
@ -98,5 +98,8 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (errd
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), SociatySubTypeBuy, rsp)
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "SociatyBuyReq", atn)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -93,5 +93,8 @@ func (this *apiComp) BookAward(session comm.IUserSession, req *pb.StonehengeBook
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "bookaward", &pb.StonehengeBookAwardResp{Btype: req.Btype, Stage: req.Stage, Award: award})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "StonehengeBookAwardReq", award)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -32,6 +32,7 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt
|
||||
err error
|
||||
szEvent []int32
|
||||
roles []*pb.BattleRole
|
||||
reward []*cfg.Gameatn
|
||||
)
|
||||
update = make(map[string]interface{})
|
||||
if errdata = this.EnterLevelCheck(session, req); errdata != nil {
|
||||
@ -150,13 +151,15 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt
|
||||
T: strconv.Itoa(int(c.Value1)),
|
||||
N: c.Value2,
|
||||
}
|
||||
if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
reward = append(reward, res)
|
||||
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
if errdata = this.module.DispenseRes(session, reward, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
// stageid 赋值
|
||||
stone.StageID = req.Stageid
|
||||
update["stageID"] = stone.StageID
|
||||
@ -176,10 +179,13 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt
|
||||
}
|
||||
}
|
||||
|
||||
if len(tasks) > 0 {
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
if len(tasks) > 0 {
|
||||
this.module.ModuleBuried.TriggerBuried(session, tasks...)
|
||||
})
|
||||
}
|
||||
}
|
||||
if len(reward) > 0 {
|
||||
this.module.WriteUserLog(session.GetUserId(), "StonehengeEnterLevelReq", reward)
|
||||
}
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -112,7 +112,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
|
||||
}
|
||||
if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(eventConf.Value1, user.Vip, user.Lv); len(lotteryward) > 0 {
|
||||
if errdata, reward = this.module.DispenseAtno(session, lotteryward, true); errdata != nil {
|
||||
this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward)
|
||||
this.module.Debugf("DispenseAtno err:+%v", lotteryward)
|
||||
}
|
||||
}
|
||||
case EventType25: // buff 三选一
|
||||
@ -181,7 +181,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
|
||||
}
|
||||
if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(battleConf.RewardLottery, user.Vip, user.Lv); len(lotteryward) > 0 {
|
||||
if errdata, reward = this.module.DispenseAtno(session, lotteryward, true); errdata != nil {
|
||||
this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward)
|
||||
this.module.Debugf("DispenseAtno err:+%v", lotteryward)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -256,7 +256,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
|
||||
|
||||
if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(eventConf.Value1, user.Vip, user.Lv); len(lotteryward) > 0 {
|
||||
if errdata, reward = this.module.DispenseAtno(session, lotteryward, true); errdata != nil {
|
||||
this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward)
|
||||
this.module.Debugf("DispenseAtno err:+%v", lotteryward)
|
||||
}
|
||||
}
|
||||
stone.Rooms.Box[req.Eventid] += 1 // 更新宝箱进度
|
||||
@ -431,8 +431,8 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
|
||||
T: strconv.Itoa(int(eventConf.Value2)),
|
||||
N: int32(n),
|
||||
}
|
||||
if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{atn}, true); errdata != nil {
|
||||
return
|
||||
if errdata, reward = this.module.DispenseAtno(session, []*cfg.Gameatn{atn}, true); errdata != nil {
|
||||
this.module.Debugf("DispenseAtno err:+%v", atn)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -93,5 +93,11 @@ func (this *apiComp) TaskReceive(session comm.IUserSession, req *pb.StonehengeTa
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "taskreceive", &pb.StonehengeTaskReceiveResp{Task: info.Task, Award: award})
|
||||
if len(award) > 0 {
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "StonehengeTaskReceiveReq", award)
|
||||
|
||||
})
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@ -92,5 +92,12 @@ func (this *apiComp) WeekAward(session comm.IUserSession, req *pb.StonehengeWeek
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "weekaward", &pb.StonehengeWeekAwardResp{Id: req.Id, Weeklyreward: info.Weeklyreward, Award: award})
|
||||
if len(award) > 0 {
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "StonehengeWeekAwardReq", award)
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -188,5 +188,10 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.StorylineComple
|
||||
"item": info.Item,
|
||||
})
|
||||
session.SendMsg(string(this.module.GetType()), "complete", &pb.StorylineCompleteResp{Level: req.Level, Story: req.Story, Award: award})
|
||||
if len(award) > 0 {
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "StorylineCompleteReq", award)
|
||||
})
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@ -87,6 +87,10 @@ func (this *UiGame) HDPSTodayConsum(uid string, ps int32) {
|
||||
N: conf.Itemget.N * sub,
|
||||
}
|
||||
this.DispenseRes(s, []*cfg.Gameatn{res}, true)
|
||||
|
||||
go this.AsynHandleSession(s.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(s.GetUserId(), "HDPSTodayConsum", res)
|
||||
})
|
||||
}
|
||||
|
||||
update["val"] = rst.Val
|
||||
@ -135,6 +139,9 @@ func (this *UiGame) HDPSTodayConsum(uid string, ps int32) {
|
||||
N: conf.Itemget.N * sub,
|
||||
}
|
||||
this.DispenseRes(s, []*cfg.Gameatn{res}, true)
|
||||
go this.AsynHandleSession(s.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(s.GetUserId(), "HDPSTodayConsum", res)
|
||||
})
|
||||
}
|
||||
|
||||
update["val"] = rst.Val
|
||||
@ -183,6 +190,9 @@ func (this *UiGame) HDPSTodayConsum(uid string, ps int32) {
|
||||
N: conf.Itemget.N * sub,
|
||||
}
|
||||
this.DispenseRes(s, []*cfg.Gameatn{res}, true)
|
||||
go this.AsynHandleSession(s.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(s.GetUserId(), "HDPSTodayConsum", res)
|
||||
})
|
||||
}
|
||||
|
||||
update["val"] = rst.Val
|
||||
|
||||
@ -74,6 +74,8 @@ func (this *apiComp) Deposit(session comm.IUserSession, req *pb.UserDepositReq)
|
||||
N: atn.N,
|
||||
},
|
||||
})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "UserDepositReq", atn)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -71,6 +71,8 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
|
||||
}
|
||||
firstLogin = true
|
||||
expand = &pb.DBUserExpand{}
|
||||
|
||||
user.CurSkin = this.module.ModuleTools.GetGlobalConf().Initper.T
|
||||
}
|
||||
// 玩家是否封号
|
||||
if user.Ban {
|
||||
|
||||
@ -3,6 +3,7 @@ package user
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
//参数校验
|
||||
@ -17,6 +18,7 @@ func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAw
|
||||
sign *pb.DBSign
|
||||
err error
|
||||
completeCount int32
|
||||
res []*cfg.Gameatn
|
||||
)
|
||||
|
||||
if sign, err = this.module.modelSign.GetUserSign(session.GetUserId()); err != nil {
|
||||
@ -36,9 +38,10 @@ func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAw
|
||||
}
|
||||
_data := this.module.configure.GetSignConf(req.Index, sign.Group)
|
||||
if _data != nil { // 发奖
|
||||
if errdata = this.module.DispenseRes(session, _data.Gamegift, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
res = append(res, _data.Gamegift...)
|
||||
// if errdata = this.module.DispenseRes(session, _data.Gamegift, true); errdata != nil {
|
||||
// return
|
||||
// }
|
||||
}
|
||||
|
||||
sign.Puzzle[req.Index] = 1
|
||||
@ -48,7 +51,11 @@ func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAw
|
||||
}
|
||||
}
|
||||
if conf := this.module.configure.GetSignExtarConf(completeCount, sign.Group); conf != nil {
|
||||
this.module.DispenseRes(session, conf.Extra, true) // 签到额外奖励
|
||||
//this.module.DispenseRes(session, conf.Extra, true) // 签到额外奖励
|
||||
res = append(res, conf.Extra...)
|
||||
}
|
||||
if errdata = this.module.DispenseRes(session, res, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
if err = this.module.modelSign.Change(session.GetUserId(), map[string]interface{}{
|
||||
"puzzle": sign.Puzzle,
|
||||
@ -63,5 +70,8 @@ func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAw
|
||||
session.SendMsg(string(this.module.GetType()), "puzzleaward", &pb.UserPuzzleAwardResp{
|
||||
Index: req.Index,
|
||||
})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "UserPuzzleAwardReq", res)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -307,6 +307,7 @@ func (this *ModelUser) changelv(session comm.IUserSession, lv int32, exp int64,
|
||||
this.module.chat.SendSysChatToUser(session, comm.ChatSystem12, lv, 0, name)
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypePlatlv, lv)
|
||||
this.module.WriteUserLog(session.GetUserId(), "changelv", rewards)
|
||||
})
|
||||
session.Push()
|
||||
|
||||
|
||||
@ -93,6 +93,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
|
||||
session.SendMsg(string(this.module.GetType()), VikingChallengeOverResp, &pb.VikingChallengeOverResp{
|
||||
Data: viking,
|
||||
})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "VikingChallengeOverReq", vikingCfg.PsConsume)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -144,5 +144,9 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "receive", &pb.WarorderReceiveResp{Rtype: req.Rtype, Warorder: warorder, Dwarorder: dwarorder, Award: ads})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "WarorderReceiveReq", awards)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -77,5 +77,8 @@ func (this *apiComp) ActivityReceive(session comm.IUserSession, req *pb.WeekTask
|
||||
"acomplete": info.Acomplete,
|
||||
})
|
||||
session.SendMsg(string(this.module.GetType()), "activityreceive", &pb.WeekTaskActivityReceiveResp{Id: req.Id, Award: award})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "WeekTaskActivityReceiveReq", conf.Reword)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -105,5 +105,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WeekTaskReceiveR
|
||||
"tcomplete": info.Tcomplete,
|
||||
})
|
||||
session.SendMsg(string(this.module.GetType()), "receive", &pb.WeekTaskReceiveResp{Tid: req.Tid, Activity: info.Activity, Tasks: info.Tasks, Progress: progress, Award: award})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "WeekTaskReceiveReq", award)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -109,5 +109,9 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) (
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), "WTaskAcceptReq", conf.GetItem)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -128,4 +128,7 @@ const (
|
||||
GameBuffType_SMOOTH = 135
|
||||
GameBuffType_SPREAD_THE_WING = 136
|
||||
GameBuffType_SERIOUS_WOUND = 137
|
||||
GameBuffType_SWORD_WALTZ = 138
|
||||
GameBuffType_GOLDEN_EGG = 139
|
||||
GameBuffType_DRAGON_FORM = 140
|
||||
)
|
||||
|
||||
@ -22,6 +22,7 @@ type GameBuriedCondiData struct {
|
||||
Head *Gameatn
|
||||
NpcEventType int32
|
||||
NPC int32
|
||||
Tipstxt string
|
||||
Value int32
|
||||
Filter []int32
|
||||
Filter2 []string
|
||||
@ -58,6 +59,7 @@ func (_v *GameBuriedCondiData)Deserialize(_buf map[string]interface{}) (err erro
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["head"].(map[string]interface{}); !_ok_ { err = errors.New("head error"); return }; if _v.Head, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Npc_event_type"].(float64); !_ok_ { err = errors.New("Npc_event_type error"); return }; _v.NpcEventType = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["NPC"].(float64); !_ok_ { err = errors.New("NPC error"); return }; _v.NPC = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tipstxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tipstxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tipstxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
|
||||
@ -14,6 +14,7 @@ type GameCatchbugSkillData struct {
|
||||
Id int32
|
||||
Skillname string
|
||||
Round int32
|
||||
Skilldescribe string
|
||||
}
|
||||
|
||||
const TypeId_GameCatchbugSkillData = -340365114
|
||||
@ -26,6 +27,7 @@ func (_v *GameCatchbugSkillData)Deserialize(_buf map[string]interface{}) (err er
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skillname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["round"].(float64); !_ok_ { err = errors.New("round error"); return }; _v.Round = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skilldescribe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skilldescribe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skilldescribe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
42
sys/configure/structs/Game.Effect.go
Normal file
42
sys/configure/structs/Game.Effect.go
Normal file
@ -0,0 +1,42 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
type GameEffect struct {
|
||||
_dataMap map[string]*GameEffectData
|
||||
_dataList []*GameEffectData
|
||||
}
|
||||
|
||||
func NewGameEffect(_buf []map[string]interface{}) (*GameEffect, error) {
|
||||
_dataList := make([]*GameEffectData, 0, len(_buf))
|
||||
dataMap := make(map[string]*GameEffectData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGameEffectData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.Key] = _v
|
||||
}
|
||||
}
|
||||
return &GameEffect{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GameEffect) GetDataMap() map[string]*GameEffectData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GameEffect) GetDataList() []*GameEffectData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GameEffect) Get(key string) *GameEffectData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
||||
37
sys/configure/structs/Game.EffectData.go
Normal file
37
sys/configure/structs/Game.EffectData.go
Normal file
@ -0,0 +1,37 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GameEffectData struct {
|
||||
Key string
|
||||
Path string
|
||||
}
|
||||
|
||||
const TypeId_GameEffectData = -1242838953
|
||||
|
||||
func (*GameEffectData) GetTypeId() int32 {
|
||||
return -1242838953
|
||||
}
|
||||
|
||||
func (_v *GameEffectData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
|
||||
{ var _ok_ bool; if _v.Path, _ok_ = _buf["path"].(string); !_ok_ { err = errors.New("path error"); return } }
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameEffectData(_buf map[string]interface{}) (*GameEffectData, error) {
|
||||
v := &GameEffectData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
@ -20,10 +20,8 @@ type GamePlayerInfor_overviewData struct {
|
||||
Url string
|
||||
Tips int32
|
||||
Resources string
|
||||
Vague string
|
||||
PvpAnimator string
|
||||
Mainq string
|
||||
Vagueq string
|
||||
Name string
|
||||
Txt string
|
||||
}
|
||||
@ -57,10 +55,8 @@ func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{})
|
||||
{ var _ok_ bool; if _v.Url, _ok_ = _buf["url"].(string); !_ok_ { err = errors.New("url error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tips"].(float64); !_ok_ { err = errors.New("tips error"); return }; _v.Tips = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Resources, _ok_ = _buf["resources"].(string); !_ok_ { err = errors.New("resources error"); return } }
|
||||
{ var _ok_ bool; if _v.Vague, _ok_ = _buf["vague"].(string); !_ok_ { err = errors.New("vague error"); return } }
|
||||
{ var _ok_ bool; if _v.PvpAnimator, _ok_ = _buf["pvpAnimator"].(string); !_ok_ { err = errors.New("pvpAnimator error"); return } }
|
||||
{ var _ok_ bool; if _v.Mainq, _ok_ = _buf["mainq"].(string); !_ok_ { err = errors.New("mainq error"); return } }
|
||||
{ var _ok_ bool; if _v.Vagueq, _ok_ = _buf["vagueq"].(string); !_ok_ { err = errors.New("vagueq error"); return } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
return
|
||||
|
||||
@ -33,6 +33,8 @@ type GameWorldTaskData struct {
|
||||
AutoAccept int32
|
||||
Tasktips int32
|
||||
LockAdd int32
|
||||
Finish []int32
|
||||
Fnishipoint []string
|
||||
Reword []*Gameatn
|
||||
Module []string
|
||||
}
|
||||
@ -105,6 +107,34 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tasktips"].(float64); !_ok_ { err = errors.New("tasktips error"); return }; _v.Tasktips = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock_add"].(float64); !_ok_ { err = errors.New("lock_add error"); return }; _v.LockAdd = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["finish"].([]interface{}); !_ok_ { err = errors.New("finish error"); return }
|
||||
|
||||
_v.Finish = make([]int32, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ int32
|
||||
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
|
||||
_v.Finish = append(_v.Finish, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["fnishipoint"].([]interface{}); !_ok_ { err = errors.New("fnishipoint error"); return }
|
||||
|
||||
_v.Fnishipoint = make([]string, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ string
|
||||
{ if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
|
||||
_v.Fnishipoint = append(_v.Fnishipoint, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
|
||||
@ -300,6 +300,7 @@ type Tables struct {
|
||||
CatchbugReward *GameCatchbugReward
|
||||
CatchbugLllustrated *GameCatchbugLllustrated
|
||||
CatchbugSkill *GameCatchbugSkill
|
||||
Effect *GameEffect
|
||||
}
|
||||
|
||||
func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
@ -2041,5 +2042,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
if tables.CatchbugSkill, err = NewGameCatchbugSkill(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_effect") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tables.Effect, err = NewGameEffect(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return tables, nil
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user