Merge branch 'master' of 60.1.1.230:backend/jieling_server

# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java
back_recharge
wangyuan 2019-01-23 09:51:54 +08:00
commit f0ef8e4324
10 changed files with 39 additions and 17 deletions

View File

@ -8,6 +8,7 @@ version '1.0.0-SNAPSHOT'
sourceCompatibility = 1.8
repositories {
mavenLocal()
mavenCentral()
}

View File

@ -1,3 +1,3 @@
RewardGroupID Info IsUpset RewardItem RewardMaxNum Loop
int string int mut,int#int,1 int int
1 钻石招募卡池1 2 1#2#3#4#5#6#7#8#9#10#11#12#13#14#15#16#17#18#19#20#21#22#23#24#25#26#27#28#29#30#31#32#33#34#35#36#37#38#39#40#41#42#43#44#45#46#47#48#49#50#51#52#53#54#55#56 1 0
Id IsUpset RewardItem RewardMaxNum Loop
int int mut,int#int,1 int int
1 2 1#2#3#4#5#6#7#8#9#10#11#12#13#14#15#16#17#18#19#20#21#22#23#24#25#26#27#28#29#30#31#32#33#34#35#36#37#38#39#40#41#42#43#44#45#46#47#48#49#50#51#52#53#54#55#56 1 0

View File

@ -1,4 +1,4 @@
Id ItemId Chance GrowChance RandomMin RandomMax
id itemId Chance GrowChance RandomMin RandomMax
int int int int int int
1 10001 100 0 1 1
2 10002 100 0 1 1

View File

@ -8,6 +8,7 @@ version '1.0.0-SNAPSHOT'
sourceCompatibility = 1.8
repositories {
mavenLocal()
mavenCentral()
}
@ -16,6 +17,8 @@ dependencies {
}
jar {
baseName = 'hotfix'
version = '1.0.0'
manifest{
attributes 'Manifest-Version':'1.0'
attributes 'Premain-Class':'com.ljsd.jieling.hotfix.JavaAgent'

View File

@ -8,6 +8,7 @@ version '1.0.0-SNAPSHOT'
sourceCompatibility = 1.8
repositories {
mavenLocal()
mavenCentral()
}

View File

@ -8,7 +8,6 @@ version '1.0.0-SNAPSHOT'
sourceCompatibility = 1.8
repositories {
maven { url "http://repo.spring.io/libs-release" }
mavenLocal()
mavenCentral()
}
@ -37,4 +36,21 @@ jar {
manifest {
attributes 'Main-Class': 'com.ljsd.jieling.ServerlogicApplication'
}
}
//JAR
task taskJar(type:Jar, dependsOn: compileJava) {
from 'build/classes/main'
destinationDir = file('build/libs')
}
//libjar
task clearJars(type:Delete){
delete 'lib'
}
task copyJars(type: Copy, dependsOn:clearJars) {
from configurations.runtime
into 'lib' //
}

View File

@ -16,7 +16,7 @@ public class SRewardGroup implements BaseConfig {
* 3
*/
private int isUpset; // 掉落type
private int[] rewardGroupID;
private int[] rewardItem;
private int rewardMaxNum; // 道具数
/**
* 3
@ -41,8 +41,8 @@ public class SRewardGroup implements BaseConfig {
return isUpset;
}
public int[] getRewardGroupID() {
return rewardGroupID;
public int[] getRewardItem() {
return rewardItem;
}
public int getRewardMaxNum() {

View File

@ -256,6 +256,13 @@ public class ProtocolsManager implements ProtocolsAbstract {
private int checkAndRefresh(ISession session, PacketNetData packetNetData) {
int myToken = 0;
if (packetNetData.getMsgId()== MessageTypeProto.MessageType.LOGIN_REQUEST_VALUE){
if (OnlineUserManager.checkUidOnline(session.getUid())){
ISession iSession = OnlineUserManager.getSessionByUid(session.getUid());
MessageUtil.sendErrorCode(session, ErrorCode.reloginCode);
OnlineUserManager.userOffline(iSession.getUid());
iSession.close();
}
OnlineUserManager.userOnline(session.getUid(),session);
//TODO 更新token
@ -266,12 +273,6 @@ public class ProtocolsManager implements ProtocolsAbstract {
}
if (OnlineUserManager.checkUidOnline(session.getUid())){
ISession iSession = OnlineUserManager.getSessionByUid(session.getUid());
MessageUtil.sendErrorCode(session, ErrorCode.reloginCode);
iSession.close();
}
// if (myToken != packetNetData.getToken()){
// return 1;
// }

View File

@ -34,7 +34,7 @@ public class ItemUtil {
}
private static void selectDrop(SRewardGroup sRewardGroup,Map<Integer, Integer> itemMap, Map<Integer, Integer> cardMap) {
int[] rewardItem = sRewardGroup.getRewardGroupID();
int[] rewardItem = sRewardGroup.getRewardItem();
StringBuilder rewardStr = new StringBuilder();
StringBuilder weight = new StringBuilder();
for (int dropId :rewardItem){

View File

@ -1,5 +1,5 @@
#server info
server.id = 10180
server.id = 10212
server.openTime = 20190101000101
server.num = 1
@ -30,7 +30,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_msy
spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10212
mongodb.options.maxWaitTime = 120000
mongodb.options.connectTimeout = 1000
mongodb.options.socketTimeout = 0