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:
meixiongfeng 2023-08-10 10:48:40 +08:00
commit 561d2f520f
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bin/json/game_herostargrow.json
View File

@ -12,45 +12,45 @@
"star": 2,
"level": 10,
"maxlevel": 20,
"starup_hp": 15,
"starup_atk": 15,
"starup_def": 15,
"starup_hp": 0,
"starup_atk": 0,
"starup_def": 0,
"starup_speed": 0
},
{
"star": 3,
"level": 20,
"maxlevel": 30,
"starup_hp": 25,
"starup_atk": 25,
"starup_def": 25,
"starup_hp": 0,
"starup_atk": 0,
"starup_def": 0,
"starup_speed": 0
},
{
"star": 4,
"level": 30,
"maxlevel": 40,
"starup_hp": 90,
"starup_atk": 90,
"starup_def": 90,
"starup_hp": 35,
"starup_atk": 35,
"starup_def": 35,
"starup_speed": 0
},
{
"star": 5,
"level": 40,
"maxlevel": 50,
"starup_hp": 210,
"starup_atk": 210,
"starup_def": 210,
"starup_hp": 105,
"starup_atk": 105,
"starup_def": 105,
"starup_speed": 0
},
{
"star": 6,
"level": 50,
"maxlevel": 60,
"starup_hp": 320,
"starup_atk": 320,
"starup_def": 320,
"starup_hp": 200,
"starup_atk": 200,
"starup_def": 200,
"starup_speed": 0
}
]

6
bin/json/game_mainstage.json
View File

@ -177,7 +177,7 @@
"hide": 0,
"destroy": 1,
"progress": 1,
"frontstoryid": 0,
"frontstoryid": 10244,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -277,7 +277,7 @@
"hide": 0,
"destroy": 1,
"progress": 1,
"frontstoryid": 0,
"frontstoryid": 10245,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -377,7 +377,7 @@
"hide": 0,
"destroy": 1,
"progress": 1,
"frontstoryid": 10244,
"frontstoryid": 10246,
"afterstoryid": 0,
"maingroupName": {
"key": "",

12
bin/json/game_recharge.json
View File

@ -446,7 +446,7 @@
{
"id": "passcheck_1",
"editionid": "debug",
"recharge_type": 5,
"recharge_type": 4,
"monetaryunit": "￥",
"amount": 9800,
"vipexp": [],
@ -460,7 +460,7 @@
{
"id": "passcheck_2",
"editionid": "debug",
"recharge_type": 5,
"recharge_type": 4,
"monetaryunit": "￥",
"amount": 9800,
"vipexp": [],
@ -488,7 +488,7 @@
{
"id": "passcheck_3",
"editionid": "debug",
"recharge_type": 5,
"recharge_type": 4,
"monetaryunit": "￥",
"amount": 3000,
"vipexp": [],
@ -502,7 +502,7 @@
{
"id": "passcheck_4",
"editionid": "debug",
"recharge_type": 5,
"recharge_type": 4,
"monetaryunit": "￥",
"amount": 6800,
"vipexp": [],
@ -698,7 +698,7 @@
{
"id": "passcheckPro_4",
"editionid": "debug",
"recharge_type": 5,
"recharge_type": 4,
"monetaryunit": "￥",
"amount": 9800,
"vipexp": [
@ -718,7 +718,7 @@
{
"id": "passcheckMid_4",
"editionid": "debug",
"recharge_type": 5,
"recharge_type": 4,
"monetaryunit": "￥",
"amount": 3000,
"vipexp": [

2
modules/warorder/api_receive.go
View File

@ -108,7 +108,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR
})
}
if dwarorder.Vip > 0 {
if warorder.Payprogress < v.Parameter {
if dwarorder.Payprogress < v.Parameter {
awards = append(awards, v.PayReward)
ads = append(ads, &pb.UserAssets{
A: v.PayReward.A,

2
modules/warorder/configure.go
View File

@ -77,7 +77,7 @@ func (this *configureComp) getGamePassCheckPrice() (confs []*cfg.GamePassCheckPr
var (
v interface{}
)
if v, err = this.GetConfigure(game_passcheck); err != nil {
if v, err = this.GetConfigure(game_passcheckprice); err != nil {
return
} else {
confs = v.(*cfg.GamePassCheckPrice).GetDataList()