fix git change

back_recharge
wangyuan 2019-06-06 17:18:46 +08:00
parent 9353c18322
commit 385ecb048e
5 changed files with 28 additions and 3 deletions

2
.gitignore vendored
View File

@ -11,4 +11,4 @@ out
build
out
tmp/
luafight/LogError/

View File

View File

@ -0,0 +1,16 @@
error:
@luafight/Modules/Battle/Logic/Base/Buff.lua:9 attempt to concatenate string and table
stack traceback:
E:\work2\jieling_server_develope\luafight/BattleMain.lua:99: in function '__concat'
luafight/Modules/Battle/Logic/Base/Buff.lua:9: in function 'getBuff'
luafight/Modules/Battle/Logic/Base/Buff.lua:33: in function 'Create'
luafight/Modules/Battle/Logic/Base/Effect.lua:726: in function '2'
luafight/Modules\Battle\Logic\BattleLogic.lua:406: in function 'Update'
E:\work2\jieling_server_develope\luafight/BattleMain.lua:95: in function <E:\work2\jieling_server_develope\luafight/BattleMain.lua:89>
[Java]: in function 'xpcall'
E:\work2\jieling_server_develope\luafight/BattleMain.lua:89: in function <E:\work2\jieling_server_develope\luafight/BattleMain.lua:80>
[Java]: in ?
fightData:
{playerData={{professionId=4,type=1,passivity={},skill={0,{20000,0.7,{17,1,1,3,1}}},superSkill={3,{20001,0.7,{6,3,5,1.75,1}},{30001,0.7,{4,10,0.25,0,2}}},element=5,roleId=10023,camp=0,property={100,20865,20865,4060,1899,2276,986,0,0,0,0,0,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=1},{professionId=2,type=1,passivity={},skill={0,{20001,0.7,{10,1.1,2,0.3}}},superSkill={3,{20002,0.7,{33,1.4,2,1,10015,0.15,10}},{20002,0.7,{16,0.04,1,15,1}}},element=5,roleId=10015,camp=0,property={100,24287,24287,3407,2305,2769,1021,0,0,0,0,0,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=1},{professionId=2,type=1,passivity={},skill={0,{20001,0.7,{1,0.85,1}},{30001,0.7,{4,9,0.1,4,2}},{30001,0.7,{4,10,0.1,4,2}}},superSkill={3,{20322,0.7,{19,1.15,1,0.6,3}}},element=4,roleId=10013,camp=0,property={100,24331,24331,3509,2813,2349,956,0,0,0,0,0,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=1},{professionId=3,type=1,passivity={},skill={0,{20001,0.7,{29,4,4,0.45,2,2,0.2}}},superSkill={4,{20000,0.7,{2,0.7,2}},{20000,0.7,{3,0.3,1,4}}},element=5,roleId=10008,camp=0,property={100,31987,31987,3146,2798,3364,763,0,0,0,0,0,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=1},{professionId=5,type=1,passivity={},skill={0,{20001,0.7,{1,0.95,2}},{10211,0.7,{5,1,0.8,4}}},superSkill={2,{20000,0.7,{2,0.9,2}},{10100,0.7,{5,1,0.77,3}}},element=2,roleId=10004,camp=0,property={100,34408,34408,2668,3422,4103,798,0,0,0,0,0,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=1},teamSkill={}},enemyData={{{professionId=1,type=1,passivity={},skill={0,{20001,0.7,{1,1.05,1}},{20000,0.7,{3,0.8,3,5}},{30301,0.7,{4,1,0.1,4,2}}},superSkill={5,{20002,0.7,{2,1.35,1}},{30001,0.7,{9,12,0.4,4,0.35}}},element=2,roleId=10002,camp=1,property={35,9524,9524,435,797,688,410,0,0,0,0,0,1.5,0,1,1,0.0014,0,0,0,0,0,0,0,0},quality=1},{professionId=1,type=1,passivity={},skill={0,{20001,0.7,{10,0.65,1,0.35}}},superSkill={5,{20001,0.7,{1,0.65,1}},{20000,0.7,{3,1,3,6}}},element=4,roleId=10003,camp=1,property={35,9521,9521,445,805,693,482,0,0,0,0,0,1.5,0,1,1,0.0014,0,0,0,0,0,0,0,0},quality=1},{professionId=5,type=1,passivity={},skill={0,{20001,0.7,{1,0.95,2}},{10211,0.7,{5,1,0.6,2}}},superSkill={2,{20000,0.7,{2,0.65,2}},{10100,0.7,{5,1,0.55,3}}},element=2,roleId=10004,camp=1,property={35,9757,9757,501,739,858,362,0,0,0,0,0,1.5,0,1,1,0.0014,0,0,0,0,0,0,0,0},quality=1},{professionId=2,type=1,passivity={},skill={0,{20001,0.7,{1,0.76,1}},{30001,0.7,{4,9,0.07,3,2}},{30001,0.7,{4,10,0.07,3,2}}},superSkill={3,{20322,0.7,{19,1.05,1,0.45,2}}},element=4,roleId=10013,camp=1,property={35,7993,7993,648,632,551,434,0,0,0,0,0,1.5,0,1,1,0.0014,0,0,0,0,0,0,0,0},quality=1},{professionId=2,type=1,passivity={},skill={0,{20001,0.7,{41,0.65,1,0.2,0.15,0}}},superSkill={3,{20001,0.7,{1,0.85,1}},{30001,0.7,{4,1,0.1,0,2}},{30001,0.7,{4,7,0.1,0,2}},{30001,0.7,{42,0.15,0.15,3}}},element=6,roleId=10014,camp=1,property={35,7988,7988,653,637,553,509,0,0,0,0,0,1.5,0,1,1,0.0014,0,0,0,0,0,0,0,0},quality=1},teamSkill={{1,{20003,0.7,{26,800}},{20003,0.7,{27,300,5}},{10003,0.7,{25,2,0.15,5}}},{2,{20003,0.7,{26,1440}},{20003,0.7,{27,540,5}},{10003,0.7,{25,3,0.15,5}}}}}}}
optionData:
{}

View File

@ -54,7 +54,7 @@ public class BuyGoodsLogic {
buyCount=buyCount+1;
int limit = sRechargeCommodityConfig.getLimit();
int type = sRechargeCommodityConfig.getType();
if(type==4 && rechargeInfo.getHadBuyFound()==1){
if(type==GiftGoodsType.GROTHFOUND && rechargeInfo.getHadBuyFound()==1){
LOGGER.error("the uid={},hadBuyFound",uid);
return;
}
@ -72,7 +72,7 @@ public class BuyGoodsLogic {
CommonProto.Drop.Builder drop = null;
if(buyCount == 1){
if(type == 4){
if(type==GiftGoodsType.GROTHFOUND){
rechargeInfo.setHadBuyFound(1);
ActivityLogic.getInstance().openActivityReallyOpen(user, ActivityType.GrowthFund);
}

View File

@ -0,0 +1,9 @@
package com.ljsd.jieling.logic.store;
public interface GiftGoodsType {
int MONTHCARD =1;//1月卡
int MONTHCARDFOREVER =2;//2永久月卡
int GEM=3;//3钻石类
int GROTHFOUND=4;//4成长基金
int DIRECTBAG=5; //5直购礼包
}