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

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

Browse Source
This commit is contained in:
wh_zcy 2022-09-23 12:09:24 +08:00
commit 08fc298cf6
10 changed files with 12173 additions and 2699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
bin/json/game_drop.json
View File

@ -804,5 +804,239 @@
],
"star": 1,
"p": 1000
},
{
"id": 63,
"dropid": 60001,
"prize": [
{
"a": "equi",
"t": "10041",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 64,
"dropid": 60001,
"prize": [
{
"a": "equi",
"t": "10042",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 65,
"dropid": 60001,
"prize": [
{
"a": "equi",
"t": "10043",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 66,
"dropid": 60001,
"prize": [
{
"a": "equi",
"t": "10044",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 67,
"dropid": 60001,
"prize": [
{
"a": "equi",
"t": "10045",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 68,
"dropid": 60001,
"prize": [
{
"a": "equi",
"t": "10046",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 69,
"dropid": 60002,
"prize": [
{
"a": "equi",
"t": "10041",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 70,
"dropid": 60002,
"prize": [
{
"a": "equi",
"t": "10042",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 71,
"dropid": 60002,
"prize": [
{
"a": "equi",
"t": "10043",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 72,
"dropid": 60002,
"prize": [
{
"a": "equi",
"t": "10044",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 73,
"dropid": 60002,
"prize": [
{
"a": "equi",
"t": "10045",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 74,
"dropid": 60002,
"prize": [
{
"a": "equi",
"t": "10046",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 75,
"dropid": 60003,
"prize": [
{
"a": "equi",
"t": "10041",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 76,
"dropid": 60003,
"prize": [
{
"a": "equi",
"t": "10042",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 77,
"dropid": 60003,
"prize": [
{
"a": "equi",
"t": "10043",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 78,
"dropid": 60003,
"prize": [
{
"a": "equi",
"t": "10044",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 79,
"dropid": 60003,
"prize": [
{
"a": "equi",
"t": "10045",
"n": 1
}
],
"star": 1,
"p": 1000
},
{
"id": 80,
"dropid": 60003,
"prize": [
{
"a": "equi",
"t": "10046",
"n": 1
}
],
"star": 1,
"p": 1000
}
]

111
bin/json/game_item.json
View File

@ -1521,5 +1521,116 @@
"key": "itemtipstxt_50012",
"text": "涌动声波-高级不足"
}
},
{
"id": "60001",
"name": {
"key": "itemname_60001",
"text": "5星装备自选箱"
},
"usetype": 4,
"color": 6,
"bagtype": 0,
"index": 18,
"special_type": 0,
"time": 0,
"effects": "",
"box_id": 60001,
"synthetize_num": 0,
"access": [
122
],
"use_skip": 0,
"upper_limit": 1,
"uselv": 0,
"isani": 0,
"star": 0,
"race": 0,
"img": "wp_icon_10009",
"ico": "wp_icon_10009",
"intr": {
"key": "itemdesc_60001",
"text": "可以任选一件5星装备"
},
"sale": [],
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_60001",
"text": "5星装备自选箱不足"
}
},
{
"id": "60002",
"name": {
"key": "itemname_60002",
"text": "5星装备随机箱"
},
"usetype": 5,
"color": 6,
"bagtype": 0,
"index": 18,
"special_type": 0,
"time": 0,
"effects": "",
"box_id": 60002,
"synthetize_num": 0,
"access": [
122
],
"use_skip": 0,
"upper_limit": 1,
"uselv": 0,
"isani": 0,
"star": 0,
"race": 0,
"img": "wp_icon_10009",
"ico": "wp_icon_10009",
"intr": {
"key": "itemdesc_60002",
"text": "可以随机获得一件5星装备"
},
"sale": [],
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_60002",
"text": "5星装备随机箱不足"
}
},
{
"id": "60003",
"name": {
"key": "itemname_60003",
"text": "5星套装宝箱"
},
"usetype": 6,
"color": 6,
"bagtype": 0,
"index": 18,
"special_type": 0,
"time": 0,
"effects": "",
"box_id": 60003,
"synthetize_num": 0,
"access": [
122
],
"use_skip": 0,
"upper_limit": 1,
"uselv": 0,
"isani": 0,
"star": 0,
"race": 0,
"img": "wp_icon_10009",
"ico": "wp_icon_10009",
"intr": {
"key": "itemdesc_60003",
"text": "可以获得一套5星装备"
},
"sale": [],
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_60003",
"text": "5星套装宝箱不足"
}
}
]

532
bin/json/game_mainline.json
View File

File diff suppressed because it is too large Load Diff

7419
bin/json/game_monster.json
View File

File diff suppressed because it is too large Load Diff

3047
bin/json/game_monsterformat.json
View File

File diff suppressed because it is too large Load Diff

23
bin/json/game_shop.json
View File

@ -63,10 +63,27 @@
],
"rtype": 2,
"rtime": 1,
"rnum": -1,
"rneed": [],
"rnum": 5,
"rneed": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
],
"shopitem": [
10004
20001,
20002,
20003,
20004,
20005,
20006,
20007,
20008,
20009,
20010,
20011,
20012
]
},
{

1652
bin/json/game_shopitem.json
View File

File diff suppressed because it is too large Load Diff

1850
bin/json/game_stroy.json
View File

File diff suppressed because it is too large Load Diff

2
modules/shop/api_getlist.go
View File

@ -2,6 +2,7 @@ package shop
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
"time"
@ -131,6 +132,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
var _items []*cfg.GameShopitemData
for _, v := range shopconf.Shopitem {
if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v, udata); err != nil || len(_items) == 0 {
this.module.Error("no founf shopgroup", log.Field{Key: "gid", Value: v})
code = pb.ErrorCode_SystemError
return
}

2
modules/shop/configure.go
View File

@ -82,7 +82,7 @@ func (this *configureComp) GetShopItemsConfigureByGroups(groupid int32, user *pb
if v.Id == groupid &&
user.Lv >= v.Lvmin &&
user.Lv <= v.Lvmax &&
v.Vip >= v.Vip {
user.Vip >= v.Vip {
result = append(result, v)
}
}