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

条件开启增加好友数量条件

Browse Source
This commit is contained in:
meixiongfeng 2023-06-30 10:48:59 +08:00
parent bdc4910743
commit 2bf027ab27
10 changed files with 162 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/json/game_item.json
View File

@ -163,7 +163,7 @@
}, },
"usetype": 1, "usetype": 1,
"color": 4, "color": 4,
"bagtype": 0, "bagtype": 1,
"index": 99, "index": 99,
"special_type": 200, "special_type": 200,
"time": 0, "time": 0,
@ -196,7 +196,7 @@
}, },
"usetype": 1, "usetype": 1,
"color": 5, "color": 5,
"bagtype": 0, "bagtype": 1,
"index": 99, "index": 99,
"special_type": 150, "special_type": 150,
"time": 0, "time": 0,
@ -8870,7 +8870,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000201", "t": "15000101",
"n": 2 "n": 2
} }
], ],
@ -8933,7 +8933,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000202", "t": "15000102",
"n": 2 "n": 2
} }
], ],
@ -8996,7 +8996,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000203", "t": "15000103",
"n": 2 "n": 2
} }
], ],
@ -9059,7 +9059,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000204", "t": "15000104",
"n": 2 "n": 2
} }
], ],
@ -9110,7 +9110,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000301", "t": "15000201",
"n": 2 "n": 2
} }
], ],
@ -9161,7 +9161,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000302", "t": "15000202",
"n": 2 "n": 2
} }
], ],
@ -9212,7 +9212,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000303", "t": "15000203",
"n": 2 "n": 2
} }
], ],
@ -9263,7 +9263,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000304", "t": "15000204",
"n": 2 "n": 2
} }
], ],

104
bin/json/game_monsterformat.json
View File

@ -115970,9 +115970,9 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 15, "lv": 15,
"hppro": 3.5, "hppro": 2.5,
"atkpro": 1, "atkpro": 0.5,
"defpro": 0.1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -116270,9 +116270,9 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 20, "lv": 20,
"hppro": 4, "hppro": 3.5,
"atkpro": 1.2, "atkpro": 0.65,
"defpro": 0.1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -116570,9 +116570,9 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 25, "lv": 25,
"hppro": 5, "hppro": 4.5,
"atkpro": 1.3, "atkpro": 0.8,
"defpro": 0.1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -116870,9 +116870,9 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 30, "lv": 30,
"hppro": 6, "hppro": 5.5,
"atkpro": 1.3, "atkpro": 0.95,
"defpro": 0.1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -117170,9 +117170,9 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 35, "lv": 35,
"hppro": 8, "hppro": 6.5,
"atkpro": 1.4, "atkpro": 1.1,
"defpro": 0.1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -117470,9 +117470,9 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 40, "lv": 40,
"hppro": 10, "hppro": 7.5,
"atkpro": 1.4, "atkpro": 1.25,
"defpro": 0.1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -117770,9 +117770,9 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 45, "lv": 45,
"hppro": 12, "hppro": 8.5,
"atkpro": 1.5, "atkpro": 1.4,
"defpro": 0.1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -118070,9 +118070,9 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 50, "lv": 50,
"hppro": 14, "hppro": 9.5,
"atkpro": 1.5, "atkpro": 1.55,
"defpro": 0.1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -118370,9 +118370,9 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 55, "lv": 55,
"hppro": 16, "hppro": 11,
"atkpro": 2, "atkpro": 1.7,
"defpro": 0.1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -118671,7 +118671,7 @@
"newskill": [], "newskill": [],
"lv": 10, "lv": 10,
"hppro": 2, "hppro": 2,
"atkpro": 1, "atkpro": 0.8,
"defpro": 0.3, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -118970,8 +118970,8 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 15, "lv": 15,
"hppro": 3, "hppro": 2.5,
"atkpro": 1, "atkpro": 0.8,
"defpro": 0.3, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -119270,8 +119270,8 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 20, "lv": 20,
"hppro": 4, "hppro": 3,
"atkpro": 1, "atkpro": 0.8,
"defpro": 0.3, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -119570,8 +119570,8 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 25, "lv": 25,
"hppro": 5, "hppro": 3.5,
"atkpro": 1, "atkpro": 0.8,
"defpro": 0.3, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -119870,8 +119870,8 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 30, "lv": 30,
"hppro": 6, "hppro": 4,
"atkpro": 1, "atkpro": 0.8,
"defpro": 0.3, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -120170,8 +120170,8 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 35, "lv": 35,
"hppro": 7, "hppro": 6,
"atkpro": 1, "atkpro": 0.8,
"defpro": 0.3, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -120471,7 +120471,7 @@
"newskill": [], "newskill": [],
"lv": 40, "lv": 40,
"hppro": 8, "hppro": 8,
"atkpro": 1, "atkpro": 0.8,
"defpro": 0.3, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -120771,7 +120771,7 @@
"newskill": [], "newskill": [],
"lv": 45, "lv": 45,
"hppro": 10, "hppro": 10,
"atkpro": 1, "atkpro": 0.8,
"defpro": 0.3, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -121071,7 +121071,7 @@
"newskill": [], "newskill": [],
"lv": 50, "lv": 50,
"hppro": 12, "hppro": 12,
"atkpro": 1, "atkpro": 0.8,
"defpro": 0.3, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -121371,7 +121371,7 @@
"newskill": [], "newskill": [],
"lv": 55, "lv": 55,
"hppro": 14, "hppro": 14,
"atkpro": 1, "atkpro": 0.8,
"defpro": 0.3, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -121671,7 +121671,7 @@
"newskill": [], "newskill": [],
"lv": 10, "lv": 10,
"hppro": 2, "hppro": 2,
"atkpro": 1.5, "atkpro": 1.2,
"defpro": 0.4, "defpro": 0.4,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -121971,7 +121971,7 @@
"newskill": [], "newskill": [],
"lv": 15, "lv": 15,
"hppro": 3, "hppro": 3,
"atkpro": 1.5, "atkpro": 1.2,
"defpro": 0.4, "defpro": 0.4,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -122271,7 +122271,7 @@
"newskill": [], "newskill": [],
"lv": 20, "lv": 20,
"hppro": 4, "hppro": 4,
"atkpro": 1.5, "atkpro": 1.2,
"defpro": 0.4, "defpro": 0.4,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -122571,7 +122571,7 @@
"newskill": [], "newskill": [],
"lv": 25, "lv": 25,
"hppro": 5, "hppro": 5,
"atkpro": 1.5, "atkpro": 1.2,
"defpro": 0.4, "defpro": 0.4,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -122871,7 +122871,7 @@
"newskill": [], "newskill": [],
"lv": 30, "lv": 30,
"hppro": 6, "hppro": 6,
"atkpro": 1.5, "atkpro": 1.2,
"defpro": 0.4, "defpro": 0.4,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -123171,7 +123171,7 @@
"newskill": [], "newskill": [],
"lv": 35, "lv": 35,
"hppro": 7, "hppro": 7,
"atkpro": 1.5, "atkpro": 1.2,
"defpro": 0.4, "defpro": 0.4,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -123471,7 +123471,7 @@
"newskill": [], "newskill": [],
"lv": 40, "lv": 40,
"hppro": 8, "hppro": 8,
"atkpro": 1.5, "atkpro": 1.2,
"defpro": 0.4, "defpro": 0.4,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -123771,7 +123771,7 @@
"newskill": [], "newskill": [],
"lv": 45, "lv": 45,
"hppro": 10, "hppro": 10,
"atkpro": 1.5, "atkpro": 1.2,
"defpro": 0.4, "defpro": 0.4,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -124071,7 +124071,7 @@
"newskill": [], "newskill": [],
"lv": 50, "lv": 50,
"hppro": 11, "hppro": 11,
"atkpro": 1.5, "atkpro": 1.2,
"defpro": 0.4, "defpro": 0.4,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -124371,7 +124371,7 @@
"newskill": [], "newskill": [],
"lv": 55, "lv": 55,
"hppro": 12, "hppro": 12,
"atkpro": 1.5, "atkpro": 1.2,
"defpro": 0.4, "defpro": 0.4,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,

27
bin/json/game_opencond.json
View File

@ -1841,5 +1841,32 @@
"uiid": 0, "uiid": 0,
"activateType": 0, "activateType": 0,
"notify": [] "notify": []
},
{
"id": "friendMz",
"name": {
"key": "opencond_opencond_name_80",
"text": "好友木桩"
},
"main": [
{
"key": 4,
"param": 10
},
{
"key": 1,
"param": 10
}
],
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_opencond_prompt_80",
"text": "好友数量"
},
"uiid": 0,
"activateType": 2,
"notify": []
} }
] ]

2
bin/json/game_skillafteratk.json
View File

@ -29230,7 +29230,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
1000 800
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],

4
bin/json/game_skillatk.json
View File

@ -12196,7 +12196,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_113002311_1", "key": "skill_skill_atk_Desc_113002311_1",
"text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。" "text": "食人鱼先生对敌方目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。"
}, },
"buffid": [], "buffid": [],
"map": "" "map": ""
@ -15317,7 +15317,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_143001211_1", "key": "skill_skill_atk_Desc_143001211_1",
"text": "阿比盖尔·斯通对敌方攻击力200%的伤害，有75%概率附加2回合[color=#e5621b]攻击下降[/color]状态。" "text": "阿比盖尔造成攻击力200%的伤害，有75%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
}, },
"buffid": [ "buffid": [
390001006 390001006

72
bin/json/game_worldbattle.json
View File

@ -10,7 +10,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 102, "id": 102,
@ -23,7 +24,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 103, "id": 103,
@ -36,7 +38,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 104, "id": 104,
@ -49,7 +52,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 105, "id": 105,
@ -62,7 +66,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 106, "id": 106,
@ -75,7 +80,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 107, "id": 107,
@ -88,7 +94,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 108, "id": 108,
@ -101,7 +108,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 109, "id": 109,
@ -114,7 +122,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 110, "id": 110,
@ -127,7 +136,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 111, "id": 111,
@ -140,7 +150,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 112, "id": 112,
@ -153,7 +164,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 113, "id": 113,
@ -166,7 +178,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 114, "id": 114,
@ -179,7 +192,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 115, "id": 115,
@ -192,7 +206,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 116, "id": 116,
@ -205,7 +220,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 117, "id": 117,
@ -218,7 +234,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 118, "id": 118,
@ -231,7 +248,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 119, "id": 119,
@ -244,7 +262,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 120, "id": 120,
@ -257,7 +276,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 121, "id": 121,
@ -270,7 +290,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 122, "id": 122,
@ -283,7 +304,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 123, "id": 123,
@ -296,7 +318,8 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
}, },
{ {
"id": 180, "id": 180,
@ -309,6 +332,7 @@
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",
"n": 0 "n": 0
} },
"carexe": 30
} }
] ]

12
modules/sys/model_sys.go
View File

@ -99,6 +99,18 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri
} else { } else {
return "" return ""
} }
case 4:
module, err := this.service.GetModule(comm.ModuleFriend)
if err != nil {
this.moduleSys.Debugln(err)
return ""
}
if v, ok := module.(comm.IFriend); ok {
if v.GetFriendCount(uid) < conf.Param {
return ""
}
}
} }
} }
return condData.Id return condData.Id

14
modules/sys/module.go
View File

@ -70,18 +70,18 @@ func (this *ModuleSys) AutoActivate(session comm.IUserSession, cids []string) bo
list, _ := this.modelSys.GetOpenCondList(session.GetUserId()) list, _ := this.modelSys.GetOpenCondList(session.GetUserId())
for _, cid := range cids { for _, cid := range cids {
opencfg := this.configure.getOpencondCfgByCid(cid) opencfg := this.configure.getOpencondCfgByCid(cid)
if opencfg != nil { if opencfg == nil {
if id := this.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足 continue
break
}
} }
for k, v := range list.Cond { if id := this.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足
if k == cid && v != 0 { continue
} else {
if _, ok := list.Cond[cid]; !ok {
list.Cond[cid] = 1 list.Cond[cid] = 1
szOpen = append(szOpen, cid) szOpen = append(szOpen, cid)
break
} }
} }
} }
if len(szOpen) > 0 { if len(szOpen) > 0 {
this.modelSys.ChangeOpenCondData(session.GetUserId(), map[string]interface{}{ this.modelSys.ChangeOpenCondData(session.GetUserId(), map[string]interface{}{

1
sys/configure/structs/Game.OpencondType.go
View File

@ -13,4 +13,5 @@ const (
GameOpencondType_Platlv = 1 GameOpencondType_Platlv = 1
GameOpencondType_Maxmapid = 2 GameOpencondType_Maxmapid = 2
GameOpencondType_Worldtaskid = 3 GameOpencondType_Worldtaskid = 3
GameOpencondType_Friend = 4
) )

2
sys/configure/structs/Game.WorldBattleData.go
View File

@ -16,6 +16,7 @@ type GameWorldBattleData struct {
BattleReadyID int32 BattleReadyID int32
EventList []int32 EventList []int32
Playexp *Gameatn Playexp *Gameatn
Carexe int32
} }
const TypeId_GameWorldBattleData = 1096332216 const TypeId_GameWorldBattleData = 1096332216
@ -56,6 +57,7 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro
} }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["playexp"].(map[string]interface{}); !_ok_ { err = errors.New("playexp error"); return }; if _v.Playexp, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["playexp"].(map[string]interface{}); !_ok_ { err = errors.New("playexp error"); return }; if _v.Playexp, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["carexe"].(float64); !_ok_ { err = errors.New("carexe error"); return }; _v.Carexe = int32(_tempNum_) }
return return
} }