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

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

Browse Source
This commit is contained in:
meixiongfeng 2023-09-01 17:11:27 +08:00
commit 365aa720ed
10 changed files with 250 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/json/game_activereward.json
View File

@ -9,11 +9,6 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "17010000",
"n": 50
},
{
"a": "attr",
"t": "gold",
@ -33,11 +28,6 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "17010000",
"n": 100
},
{
"a": "attr",
"t": "gold",
@ -57,11 +47,6 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "17010000",
"n": 100
},
{
"a": "attr",
"t": "gold",
@ -81,11 +66,6 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "17010000",
"n": 100
},
{
"a": "attr",
"t": "gold",

20
bin/json/game_gm.json
View File

@ -298,5 +298,25 @@
},
"data": "",
"prefix": "bingo:jx"
},
{
"id": 33,
"type": 2,
"text": {
"key": "GM_GM_text_36",
"text": "铁匠铺满熟练度"
},
"data": "",
"prefix": "bingo:smithypro"
},
{
"id": 34,
"type": 2,
"text": {
"key": "GM_GM_text_37",
"text": "铁匠铺满图鉴"
},
"data": "",
"prefix": "bingo:smithyatlas"
}
]

25
bin/json/game_guildsign.json
View File

@ -17,11 +17,6 @@
"a": "attr",
"t": "ps",
"n": 5
},
{
"a": "item",
"t": "17060006",
"n": 4
}
],
"exp": {
@ -48,11 +43,6 @@
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "item",
"t": "17060007",
"n": 2
}
],
"exp": {
@ -79,11 +69,6 @@
"a": "attr",
"t": "ps",
"n": 15
},
{
"a": "item",
"t": "17060008",
"n": 1
}
],
"exp": {
@ -110,11 +95,6 @@
"a": "attr",
"t": "ps",
"n": 15
},
{
"a": "item",
"t": "17060008",
"n": 1
}
],
"exp": {
@ -141,11 +121,6 @@
"a": "attr",
"t": "ps",
"n": 15
},
{
"a": "item",
"t": "17060008",
"n": 1
}
],
"exp": {

390
bin/json/game_item.json
View File

File diff suppressed because it is too large Load Diff

2
bin/json/game_itemlink.json
View File

@ -281,7 +281,7 @@
"key": "itemlink_itemlink_desc_17",
"text": "通过烹饪可以概率获得"
},
"jumpid": 701,
"jumpid": 140,
"btnTitle": {
"key": "itemlink_itemlink_button_1",
"text": "立即前往"

2
bin/json/game_paypackage.json
View File

@ -418,7 +418,7 @@
},
{
"a": "item",
"t": "17060008",
"t": "10000001",
"n": 85
}
]

36
bin/json/game_recharge.json
View File

@ -9,14 +9,14 @@
{
"a": "attr",
"t": "diamond",
"n": 60
"n": 30
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "diamond",
"n": 30
"n": 60
}
],
"channel": "0",
@ -34,14 +34,14 @@
{
"a": "attr",
"t": "diamond",
"n": 300
"n": 150
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "diamond",
"n": 150
"n": 300
}
],
"channel": "0",
@ -59,14 +59,14 @@
{
"a": "attr",
"t": "diamond",
"n": 680
"n": 340
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "diamond",
"n": 340
"n": 680
}
],
"channel": "0",
@ -84,14 +84,14 @@
{
"a": "attr",
"t": "diamond",
"n": 980
"n": 490
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "diamond",
"n": 490
"n": 980
}
],
"channel": "0",
@ -109,14 +109,14 @@
{
"a": "attr",
"t": "diamond",
"n": 1280
"n": 640
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "diamond",
"n": 640
"n": 1280
}
],
"channel": "0",
@ -134,14 +134,14 @@
{
"a": "attr",
"t": "diamond",
"n": 1980
"n": 990
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "diamond",
"n": 990
"n": 1980
}
],
"channel": "0",
@ -159,14 +159,14 @@
{
"a": "attr",
"t": "diamond",
"n": 3280
"n": 1640
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "diamond",
"n": 1640
"n": 3280
}
],
"channel": "0",
@ -184,14 +184,14 @@
{
"a": "attr",
"t": "diamond",
"n": 6480
"n": 3240
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "diamond",
"n": 3240
"n": 6480
}
],
"channel": "0",
@ -209,14 +209,14 @@
{
"a": "attr",
"t": "diamond",
"n": 60
"n": 30
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "diamond",
"n": 30
"n": 60
}
],
"channel": "0",

3
bin/json/game_shop.json
View File

@ -179,7 +179,6 @@
"rnum": -1,
"rneed": [],
"shopitem": [
14001,
14002,
14003,
14004,
@ -210,14 +209,12 @@
"rnum": -1,
"rneed": [],
"shopitem": [
15001,
15002,
15003,
15004,
15005,
15006,
15007,
15008,
15009
]
}

20
bin/json/game_taskactivereward.json
View File

@ -9,11 +9,6 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "17010000",
"n": 50
},
{
"a": "attr",
"t": "gold",
@ -33,11 +28,6 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "17010000",
"n": 100
},
{
"a": "attr",
"t": "gold",
@ -57,11 +47,6 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "17010000",
"n": 100
},
{
"a": "attr",
"t": "gold",
@ -81,11 +66,6 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "17010000",
"n": 100
},
{
"a": "attr",
"t": "gold",

15
modules/sociaty/api_cross_setting.go
View File

@ -1,9 +1,11 @@
package sociaty
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
"go_dreamfactory/sys/wordfilter"
)
// 公会设置
@ -30,6 +32,19 @@ func (this *apiComp) Setting(session comm.IUserSession, req *pb.SociatySettingRe
}
uid := session.GetUserId()
//铭感词校验 工会公告
if len(req.Notice) > 0 {
if iscompliance, inscriptionwords := wordfilter.Validate(req.Notice); !iscompliance {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SociatyNoticeInscriptionWords,
Title: pb.ErrorCode_SociatyNoticeInscriptionWords.ToString(),
Message: fmt.Sprintf("工会公告包含铭感词:%s", inscriptionwords),
}
return
}
}
sociaty := this.module.modelSociaty.getUserSociaty(uid)
if sociaty == nil {
this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid})