Merge branch 'second'
This commit is contained in:
commit
d0708364ff
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
[{"id":90001,"income_premiseID":1,"income":"80029:1","repeat":0,"frequency":0,"interval":0},{"id":90002,"income_premiseID":2,"income":"80030:1","repeat":0,"frequency":0,"interval":0},{"id":90003,"income_premiseID":3,"income":"80031:1","repeat":1,"frequency":10,"interval":30},{"id":90004,"income_premiseID":3,"income":"80031:1","repeat":1,"frequency":1,"interval":0}]
|
||||
[{"id":90001,"income_premiseID":1,"income":"80029:1","repeat":0,"frequency":0,"interval":0},{"id":90002,"income_premiseID":2,"income":"80030:1","repeat":0,"frequency":0,"interval":0},{"id":90003,"income_premiseID":3,"income":"80031:1","repeat":1,"frequency":10,"interval":30},{"id":90004,"income_premiseID":3,"income":"80031:1","repeat":1,"frequency":1,"interval":0},{"id":90005,"income_premiseID":3,"income":"80033:1","repeat":1,"frequency":10,"interval":30},{"id":90006,"income_premiseID":3,"income":"80034:1","repeat":1,"frequency":10,"interval":30},{"id":90007,"income_premiseID":3,"income":"80033:1","repeat":1,"frequency":1,"interval":0},{"id":90008,"income_premiseID":3,"income":"80034:1","repeat":1,"frequency":1,"interval":0}]
|
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
[{"id":90001,"parname":"打开单抽常规卡包","consume1":"80025:1","consume2":"","actypeid":1,"get":"80017:1|80013:100"},{"id":90002,"parname":"打开十连抽常规卡包","consume1":"80011:1","consume2":"80025:10","actypeid":1,"get":"80018:1|80013:1000"},{"id":90003,"parname":"刷新随机到的武将","consume1":"80012:50","consume2":"","actypeid":2,"get":""},{"id":90004,"parname":"合成完整藏宝图","consume1":"80001:1|80002:1|80003:1|80004:1|80005:1|80006:1|80007:1|80008:1|80009:1|80010:1|","consume2":"","actypeid":1,"get":"80011:1"}]
|
||||
[{"id":90001,"parname":"打开单抽常规卡包","consume1":"80025:1","consume2":"","actypeid":1,"get":"80017:1"},{"id":90002,"parname":"打开十连抽常规卡包","consume1":"80011:1","consume2":"80025:10","actypeid":1,"get":"80018:1"},{"id":90003,"parname":"刷新随机到的武将","consume1":"80012:50","consume2":"","actypeid":2,"get":""},{"id":90004,"parname":"合成完整藏宝图","consume1":"80001:1|80002:1|80003:1|80004:1|80005:1|80006:1|80007:1|80008:1|80009:1|80010:1|","consume2":"","actypeid":1,"get":"80011:1"}]
|
File diff suppressed because one or more lines are too long
@ -4,7 +4,6 @@ export class DropItemCfg implements Cfg{
|
||||
name: "DropItemCfg";
|
||||
|
||||
public id: number;
|
||||
public parname: string;
|
||||
public itemtypeid: number;
|
||||
public Price: string;
|
||||
public autopen: number;
|
||||
@ -18,7 +17,6 @@ export class DropItemCfg implements Cfg{
|
||||
|
||||
public decode(data: any) {
|
||||
this.id = data.id;
|
||||
this.parname = data.parname;
|
||||
this.itemtypeid = data.itemtypeid;
|
||||
this.Price = data.Price;
|
||||
this.autopen = data.autopen;
|
||||
|
Loading…
x
Reference in New Issue
Block a user