From 4d5cb820e0e3fb6accd13901e7cf381624a7797e Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 28 May 2021 18:01:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BF=83=E6=84=BF=E6=8A=BD=E5=A5=96,?= =?UTF-8?q?=E6=B6=88=E8=80=97=E7=89=A9=E5=93=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/serverlogic/src/main/resources/application.properties b/serverlogic/src/main/resources/application.properties index 8a90108ef..4bfc6b420 100644 --- a/serverlogic/src/main/resources/application.properties +++ b/serverlogic/src/main/resources/application.properties @@ -1,5 +1,5 @@ #server info -server.id = 10161 +server.id = 10232 server.openTime = 20190101000101 server.num = 1 server.debug = true @@ -7,24 +7,24 @@ server.logDir = D:\\jl_logs server.guildFight = false server.sendlog37 = true # redis config -# Redis数据库索引(默认为0) +# Redis锟斤拷锟捷匡拷锟斤拷锟斤拷锟斤拷默锟斤拷为0锟斤拷 spring.redis.database=0 #spring.redis.database=2 -# Redis服务器地址 +# Redis锟斤拷锟斤拷锟斤拷锟斤拷址 spring.redis.host=60.1.1.21 -# Redis服务器连接端口 +# Redis锟斤拷锟斤拷锟斤拷锟斤拷锟接端匡拷 spring.redis.port=6379 -# Redis服务器连接密码(默认为空) +# Redis锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟诫(默锟斤拷为锟秸o拷 spring.redis.password= -# 连接池最大连接数(使用负值表示没有限制) +# 锟斤拷锟接筹拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟绞癸拷酶锟街碉拷锟绞久伙拷锟斤拷锟斤拷疲锟 spring.redis.pool.max-active=8 -# 连接池最大阻塞等待时间(使用负值表示没有限制) +# 锟斤拷锟接筹拷锟斤拷锟斤拷锟斤拷锟斤拷却锟绞憋拷洌ㄊ癸拷酶锟街碉拷锟绞久伙拷锟斤拷锟斤拷疲锟 spring.redis.pool.max-wait=-1 -# 连接池中的最大空闲连接 +# 锟斤拷锟接筹拷锟叫碉拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 spring.redis.pool.max-idle=8 -# 连接池中的最小空闲连接 +# 锟斤拷锟接筹拷锟叫碉拷锟斤拷小锟斤拷锟斤拷锟斤拷锟斤拷 spring.redis.pool.min-idle=0 -# 连接超时时间(毫秒) +# 锟斤拷锟接筹拷时时锟戒(锟斤拷锟诫) spring.redis.timeout=0 spring.redis.expireTime = -1 @@ -33,7 +33,7 @@ spring.redis.expireTime = -1 #spring.data.mongodb.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/ysj_wx_1 #spring.data.mongodb2.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/develop_ysj_wx_1 #mongodb2 develop -spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10161 +spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10232 spring.data.mongodbcore.uri = mongodb://60.1.1.14:27017/jl_core #spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10212 mongodb.options.maxWaitTime = 120000 @@ -62,7 +62,7 @@ netty.allTimeout=35 #core -services.core.ip=60.1.1.161 +services.core.ip=60.1.1.232 services.core.port=7900 services.core.area=1000 services.core.id=1 From 36796f01b818d751f83dfcf6bb8419bfe2f569dd Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 28 May 2021 18:01:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"=E5=BF=83=E6=84=BF=E6=8A=BD?= =?UTF-8?q?=E5=A5=96,=E6=B6=88=E8=80=97=E7=89=A9=E5=93=81bug"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4d5cb820e0e3fb6accd13901e7cf381624a7797e. --- .../src/main/resources/application.properties | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/serverlogic/src/main/resources/application.properties b/serverlogic/src/main/resources/application.properties index 4bfc6b420..8a90108ef 100644 --- a/serverlogic/src/main/resources/application.properties +++ b/serverlogic/src/main/resources/application.properties @@ -1,5 +1,5 @@ #server info -server.id = 10232 +server.id = 10161 server.openTime = 20190101000101 server.num = 1 server.debug = true @@ -7,24 +7,24 @@ server.logDir = D:\\jl_logs server.guildFight = false server.sendlog37 = true # redis config -# Redis锟斤拷锟捷匡拷锟斤拷锟斤拷锟斤拷默锟斤拷为0锟斤拷 +# Redis数据库索引(默认为0) spring.redis.database=0 #spring.redis.database=2 -# Redis锟斤拷锟斤拷锟斤拷锟斤拷址 +# Redis服务器地址 spring.redis.host=60.1.1.21 -# Redis锟斤拷锟斤拷锟斤拷锟斤拷锟接端匡拷 +# Redis服务器连接端口 spring.redis.port=6379 -# Redis锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟诫(默锟斤拷为锟秸o拷 +# Redis服务器连接密码(默认为空) spring.redis.password= -# 锟斤拷锟接筹拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟绞癸拷酶锟街碉拷锟绞久伙拷锟斤拷锟斤拷疲锟 +# 连接池最大连接数(使用负值表示没有限制) spring.redis.pool.max-active=8 -# 锟斤拷锟接筹拷锟斤拷锟斤拷锟斤拷锟斤拷却锟绞憋拷洌ㄊ癸拷酶锟街碉拷锟绞久伙拷锟斤拷锟斤拷疲锟 +# 连接池最大阻塞等待时间(使用负值表示没有限制) spring.redis.pool.max-wait=-1 -# 锟斤拷锟接筹拷锟叫碉拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 +# 连接池中的最大空闲连接 spring.redis.pool.max-idle=8 -# 锟斤拷锟接筹拷锟叫碉拷锟斤拷小锟斤拷锟斤拷锟斤拷锟斤拷 +# 连接池中的最小空闲连接 spring.redis.pool.min-idle=0 -# 锟斤拷锟接筹拷时时锟戒(锟斤拷锟诫) +# 连接超时时间(毫秒) spring.redis.timeout=0 spring.redis.expireTime = -1 @@ -33,7 +33,7 @@ spring.redis.expireTime = -1 #spring.data.mongodb.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/ysj_wx_1 #spring.data.mongodb2.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/develop_ysj_wx_1 #mongodb2 develop -spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10232 +spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10161 spring.data.mongodbcore.uri = mongodb://60.1.1.14:27017/jl_core #spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10212 mongodb.options.maxWaitTime = 120000 @@ -62,7 +62,7 @@ netty.allTimeout=35 #core -services.core.ip=60.1.1.232 +services.core.ip=60.1.1.161 services.core.port=7900 services.core.area=1000 services.core.id=1 From f2e84cceac196fa965ddfc4139c74a5e119b628a Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 28 May 2021 18:02:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BF=83=E6=84=BF=E6=8A=BD=E5=A5=96,?= =?UTF-8?q?=E6=B6=88=E8=80=97=E7=89=A9=E5=93=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 523b49a84..a91a33ee0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -1551,7 +1551,7 @@ public class ActivityLogic implements IEventHandler{ // 娑堣垂鎶藉彇 if (drop == null){ // 鍗佽繛鎶借繕鏄崟鎶芥秷鑰楃墿鍝佽幏鍙 - int[][] item = type == 1?setting.getCostItemMul():setting.getCostItemSingle(); + int[][] item = type == 1?setting.getCostItemSingle():setting.getCostItemMul(); // 楠岃瘉閬撳叿娑堣 int[][] cost = new int[][]{{item[0][0],item[0][1]}}; boolean itemCost = ItemUtil.itemCost(user, cost, BIReason.CHOICE_DRAW_CARD, 0); From c29b7a25cdb77a2fd2aba7ca6cb6414a7fc55374 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Fri, 28 May 2021 18:50:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E7=BA=A2=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/championship/ChampionshipLogic.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index 5c9daafa4..a822cf724 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -414,13 +414,14 @@ public class ChampionshipLogic { user.getArenaManager().setTopMaxRank(rank); } user.getUserMissionManager().onGameEvent(user, GameEvent.CHAMPIONSHIP_RANK, rank); + if(rank == 1){ + Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.top_match_rank.getType(),1)); + } rank++; String title = SErrorCodeEerverConfig.getI18NMessage("champion_reward_title"); String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("champion_reward_txt", new Object[]{sChampionshipReward.getTitleDesc()},new int[]{1},"#"); MailLogic.getInstance().sendMail(user.getId(), title, content, ItemUtil.getMailReward(sChampionshipReward.getSeasonReward()), nowTime, Global.MAIL_EFFECTIVE_TIME); - if(rank == 1){ - Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.top_match_rank.getType(),1)); - } + } }catch (Exception e){ LOGGER.info("Exception e = "+"size"+ arenaRankInfo.size()+ e.toString());