Merge branch 'master' of git.kingsome.cn:node/card_svr

config/compound_tbl.json

@@ -1 +1 @@
-[{"id":99001,"type_id":1,"value":"6"},{"id":99002,"type_id":1,"value":"2"},{"id":99003,"type_id":2,"value":"20"},{"id":99004,"type_id":1,"value":"2"},{"id":99005,"type_id":1,"value":"1"},{"id":99006,"type_id":1,"value":"20"},{"id":99007,"type_id":1,"value":"12"},{"id":99008,"type_id":2,"value":"12"},{"id":99009,"type_id":2,"value":"15"},{"id":99010,"type_id":2,"value":"15"},{"id":99011,"type_id":2,"value":"20"},{"id":99012,"type_id":2,"value":"8"},{"id":99013,"type_id":1,"value":"3"},{"id":99014,"type_id":2,"value":"5"},{"id":99015,"type_id":1,"value":"10"},{"id":99016,"type_id":1,"value":"10"},{"id":99017,"type_id":2,"value":"7"},{"id":99018,"type_id":2,"value":"7"},{"id":99019,"type_id":2,"value":"5"},{"id":99020,"type_id":2,"value":"30"},{"id":99021,"type_id":3,"value":"15"},{"id":99022,"type_id":3,"value":"35"},{"id":99023,"type_id":1,"value":"2"},{"id":99024,"type_id":1,"value":"3"},{"id":99025,"type_id":1,"value":"3"},{"id":99026,"type_id":2,"value":"1"},{"id":99027,"type_id":1,"value":"5"},{"id":99028,"type_id":1,"value":"5"},{"id":99029,"type_id":1,"value":"6"},{"id":99030,"type_id":1,"value":"6"},{"id":99031,"type_id":4,"value":"90001"},{"id":99032,"type_id":4,"value":"90002"},{"id":99033,"type_id":2,"value":"15"},{"id":99034,"type_id":4,"value":"80031"},{"id":99035,"type_id":4,"value":"80029"},{"id":99036,"type_id":4,"value":"80030"},{"id":99037,"type_id":4,"value":"80032"},{"id":99038,"type_id":1,"value":"20"},{"id":99039,"type_id":5,"value":"0"},{"id":99040,"type_id":5,"value":"0"},{"id":99041,"type_id":3,"value":"50"},{"id":99042,"type_id":3,"value":"0"},{"id":99043,"type_id":3,"value":"45"},{"id":99044,"type_id":3,"value":"68"},{"id":99045,"type_id":3,"value":"80"},{"id":99046,"type_id":3,"value":"0"},{"id":99047,"type_id":3,"value":"5"},{"id":99048,"type_id":3,"value":"15"},{"id":99049,"type_id":3,"value":"30"},{"id":99050,"type_id":4,"value":"130001:130014"},{"id":99051,"type_id":4,"value":"130017:130041"},{"id":99052,"type_id":4,"value":"130044:130068"}]
+[{"id":99001,"type_id":1,"value":"6"},{"id":99002,"type_id":1,"value":"2"},{"id":99003,"type_id":2,"value":"20"},{"id":99004,"type_id":1,"value":"2"},{"id":99005,"type_id":1,"value":"1"},{"id":99006,"type_id":1,"value":"20"},{"id":99007,"type_id":1,"value":"12"},{"id":99008,"type_id":2,"value":"12"},{"id":99009,"type_id":2,"value":"15"},{"id":99010,"type_id":2,"value":"15"},{"id":99011,"type_id":2,"value":"20"},{"id":99012,"type_id":2,"value":"8"},{"id":99013,"type_id":1,"value":"3"},{"id":99014,"type_id":2,"value":"5"},{"id":99015,"type_id":1,"value":"10"},{"id":99016,"type_id":1,"value":"10"},{"id":99017,"type_id":2,"value":"7"},{"id":99018,"type_id":2,"value":"7"},{"id":99019,"type_id":2,"value":"5"},{"id":99020,"type_id":2,"value":"30"},{"id":99021,"type_id":3,"value":"15"},{"id":99022,"type_id":3,"value":"35"},{"id":99023,"type_id":1,"value":"2"},{"id":99024,"type_id":1,"value":"3"},{"id":99025,"type_id":1,"value":"3"},{"id":99026,"type_id":2,"value":"1"},{"id":99027,"type_id":1,"value":"6"},{"id":99028,"type_id":1,"value":"6"},{"id":99029,"type_id":1,"value":"6"},{"id":99030,"type_id":1,"value":"6"},{"id":99031,"type_id":4,"value":"90001"},{"id":99032,"type_id":4,"value":"90002"},{"id":99033,"type_id":2,"value":"15"},{"id":99034,"type_id":4,"value":"80031"},{"id":99035,"type_id":4,"value":"80029"},{"id":99036,"type_id":4,"value":"80030"},{"id":99037,"type_id":4,"value":"80032"},{"id":99038,"type_id":1,"value":"20"},{"id":99039,"type_id":5,"value":"0"},{"id":99040,"type_id":5,"value":"0"},{"id":99041,"type_id":3,"value":"50"},{"id":99042,"type_id":3,"value":"0"},{"id":99043,"type_id":3,"value":"50"},{"id":99044,"type_id":3,"value":"65"},{"id":99045,"type_id":3,"value":"80"},{"id":99046,"type_id":3,"value":"0"},{"id":99047,"type_id":3,"value":"10"},{"id":99048,"type_id":3,"value":"20"},{"id":99049,"type_id":3,"value":"30"},{"id":99050,"type_id":4,"value":"130001:130019"},{"id":99051,"type_id":4,"value":"130021:130050"},{"id":99052,"type_id":4,"value":"130052:130082"}]

config/income_tbl.json

@@ -1 +1 @@
-[{"id":90001,"income_premiseID":1,"income":"80029:1:1","repeat":0,"frequency":0,"interval":0},{"id":90002,"income_premiseID":2,"income":"80030:1:1","repeat":0,"frequency":0,"interval":0},{"id":90003,"income_premiseID":3,"income":"80031:2:1|80031:1:2","repeat":1,"frequency":10,"interval":30},{"id":90005,"income_premiseID":3,"income":"80033:2:1|80033:1:2","repeat":1,"frequency":10,"interval":30},{"id":90006,"income_premiseID":3,"income":"80034:2:1|80034:1:2","repeat":1,"frequency":10,"interval":30}]
+[{"id":90001,"income_premiseID":1,"income":"80029:1:1","repeat":0,"frequency":0,"interval":0},{"id":90002,"income_premiseID":2,"income":"80030:1:1","repeat":0,"frequency":0,"interval":0},{"id":90003,"income_premiseID":3,"income":"80031:2:1|80031:1:2","repeat":1,"frequency":10,"interval":30},{"id":90005,"income_premiseID":3,"income":"80033:2:1|80033:1:2","repeat":1,"frequency":10,"interval":30},{"id":90006,"income_premiseID":3,"income":"80034:2:1|80034:1:2","repeat":1,"frequency":10,"interval":30},{"id":90007,"income_premiseID":4,"income":"80035:1:1","repeat":0,"frequency":0,"interval":0},{"id":90008,"income_premiseID":5,"income":"80036:1:1","repeat":0,"frequency":0,"interval":0},{"id":90009,"income_premiseID":6,"income":"80037:1:1","repeat":0,"frequency":0,"interval":0}]

src/rooms/logic/Handler/PetHandler.ts

@@ -117,6 +117,8 @@ export class PetHandler {
             this.addSkill(skillid);
         });
 
+        this._owner.onPetBornedNotify(this);
+        
         this._owner.onHaloAdd(this);
 
         this._owner.onPetBorned(this, param);

src/rooms/logic/Handler/PlayerHandler.ts

@@ -452,8 +452,11 @@ export class PlayerHandler {
         return this._player.state != 2;
     };
 
-    public onPetBorned(apet: PetHandler, param: SkillParam){
+    public onPetBornedNotify(apet: PetHandler){
         this._owner.onAddPetNotify(apet, apet == this._self);
+    };
+
+    public onPetBorned(apet: PetHandler, param: SkillParam){
         this.onEMChanged(apet._enmagic);//增加法强
         // 战吼
         if(!apet.isSilent()){