Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java
wangyuan
commit
4920b68b41
|
|
@ -31,6 +31,7 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
|
||||
private int order;
|
||||
|
||||
private int accumulativeRecharge;
|
||||
public static Map<Integer, SRechargeCommodityConfig> rechargeCommodityConfigMap;
|
||||
public static Map<Integer, SRechargeCommodityConfig> rechargeLevelMap;
|
||||
|
||||
|
|
@ -96,5 +97,7 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
return order;
|
||||
}
|
||||
|
||||
|
||||
public int getAccumulativeRecharge() {
|
||||
return accumulativeRecharge;
|
||||
}
|
||||
}
|
||||
|
|
@ -35,8 +35,6 @@ public class KtBeanBuilderUtils {
|
|||
public static ParamDataBean paramDataBuildForSystem() {
|
||||
ParamDataBean paramDataBean = new ParamDataBean();
|
||||
paramDataBean.setApp_id_s(KTSDKConstans.appid);
|
||||
paramDataBean.setApp_version_name_s("jieling");
|
||||
paramDataBean.setApp_version_code_s("1.0.0.0");
|
||||
paramDataBean.setServer_s(String.valueOf(GameApplication.serverId));
|
||||
paramDataBean.setData_unix((int)(System.currentTimeMillis()/1000));
|
||||
paramDataBean.setRegion_s("4");
|
||||
|
|
|
|||
|
|
@ -0,0 +1,108 @@
|
|||
package com.ljsd.jieling.ktbeans.BeanBuilder;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.*;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
|
||||
import com.ljsd.jieling.ktbeans.sendbeans.*;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
|
||||
public class ParamBuilder {
|
||||
public static KTParam paramBuild(User user,int type,ParamEventBean paramEventBean){
|
||||
int uid = user.getId();
|
||||
switch (type){
|
||||
case ParamEventBean
|
||||
.UserActivityEvent:
|
||||
KTRoleActivity ktRoleActivity = new KTRoleActivity();
|
||||
ktRoleActivity.setParam_data(KtEventUtils.dataBuild(uid));
|
||||
ktRoleActivity.setParam_environment(KtEventUtils.enviromentBuild(uid));
|
||||
ktRoleActivity.setParam_user(KtEventUtils.userBuild(user));
|
||||
ktRoleActivity.setParam_role(KtEventUtils.roleBuild(user));
|
||||
ktRoleActivity.setParam_event(paramEventBean);
|
||||
return ktRoleActivity;
|
||||
|
||||
case ParamEventBean
|
||||
.UserItemEvent:
|
||||
KTRoleItem ktRoleItem = new KTRoleItem();
|
||||
ktRoleItem.setParam_data(KtEventUtils.dataBuild(uid));
|
||||
ktRoleItem.setParam_environment(KtEventUtils.enviromentBuild(uid));
|
||||
ktRoleItem.setParam_user(KtEventUtils.userBuild(user));
|
||||
ktRoleItem.setParam_role(KtEventUtils.roleBuild(user));
|
||||
ktRoleItem.setParam_event(paramEventBean);
|
||||
return ktRoleItem;
|
||||
|
||||
case ParamEventBean
|
||||
.UserCurrencyEvent:
|
||||
KTRoleCurrency ktRoleCurrency = new KTRoleCurrency();
|
||||
ktRoleCurrency.setParam_data(KtEventUtils.dataBuild(uid));
|
||||
ktRoleCurrency.setParam_environment(KtEventUtils.enviromentBuild(uid));
|
||||
ktRoleCurrency.setParam_user(KtEventUtils.userBuild(user));
|
||||
ktRoleCurrency.setParam_role(KtEventUtils.roleBuild(user));
|
||||
ktRoleCurrency.setParam_event(paramEventBean);
|
||||
return ktRoleCurrency;
|
||||
|
||||
case ParamEventBean
|
||||
.UserLoginOutEvent:
|
||||
KTRoleLogin ktRoleLogin = new KTRoleLogin();
|
||||
ktRoleLogin.setParam_data(KtEventUtils.dataBuild(uid));
|
||||
ktRoleLogin.setParam_environment(KtEventUtils.simpleEnviromentBuild(uid));
|
||||
ktRoleLogin.setParam_user(KtEventUtils.userBuild(user));
|
||||
ktRoleLogin.setParam_role(KtEventUtils.roleBuild(user));
|
||||
ktRoleLogin.setParam_event(paramEventBean);
|
||||
return ktRoleLogin;
|
||||
|
||||
|
||||
case ParamEventBean
|
||||
.UserStoreEvent:
|
||||
KTRoleMall ktRoleMall = new KTRoleMall();
|
||||
ktRoleMall.setParam_data(KtEventUtils.dataBuild(uid));
|
||||
ktRoleMall.setParam_environment(KtEventUtils.enviromentBuild(uid));
|
||||
ktRoleMall.setParam_user(KtEventUtils.userBuild(user));
|
||||
ktRoleMall.setParam_role(KtEventUtils.roleBuild(user));
|
||||
ktRoleMall.setParam_event(paramEventBean);
|
||||
return ktRoleMall;
|
||||
|
||||
case ParamEventBean
|
||||
.UserPayEvent:
|
||||
KTRolePay ktRolePay = new KTRolePay();
|
||||
ktRolePay.setParam_data(KtEventUtils.dataBuild(uid));
|
||||
ktRolePay.setParam_environment(KtEventUtils.enviromentBuild(uid));
|
||||
ktRolePay.setParam_user(KtEventUtils.userBuild(user));
|
||||
ktRolePay.setParam_role(KtEventUtils.roleBuild(user));
|
||||
ktRolePay.setParam_event(paramEventBean);
|
||||
return ktRolePay;
|
||||
|
||||
case ParamEventBean
|
||||
.UserRegister:
|
||||
KTRoleRegister ktRoleRegister = new KTRoleRegister();
|
||||
ktRoleRegister.setParam_data(KtEventUtils.dataBuild(uid));
|
||||
ktRoleRegister.setParam_environment(KtEventUtils.enviromentBuild(uid));
|
||||
ktRoleRegister.setParam_user(KtEventUtils.userBuild(user));
|
||||
ktRoleRegister.setParam_role(KtEventUtils.roleBuild(user));
|
||||
ktRoleRegister.setParam_event(paramEventBean);
|
||||
return ktRoleRegister;
|
||||
|
||||
case ParamEventBean
|
||||
.UserTaskEvent:
|
||||
KTRoleTask ktRoleTask = new KTRoleTask();
|
||||
ktRoleTask.setParam_data(KtEventUtils.dataBuild(uid));
|
||||
ktRoleTask.setParam_environment(KtEventUtils.enviromentBuild(uid));
|
||||
ktRoleTask.setParam_user(KtEventUtils.userBuild(user));
|
||||
ktRoleTask.setParam_role(KtEventUtils.roleBuild(user));
|
||||
ktRoleTask.setParam_event(paramEventBean);
|
||||
return ktRoleTask;
|
||||
case ParamEventBean
|
||||
.UserLogin:
|
||||
KtUserLogin ktUserLogin = new KtUserLogin();
|
||||
ktUserLogin.setParam_data(KtEventUtils.dataBuild(uid));
|
||||
ktUserLogin.setParam_environment(KtEventUtils.simpleEnviromentBuild(uid));
|
||||
ktUserLogin.setParam_user(KtEventUtils.userSimpleBuild(user));
|
||||
ktUserLogin.setParam_role(KtEventUtils.roleBuild(user));
|
||||
ktUserLogin.setParam_event(paramEventBean);
|
||||
return ktUserLogin;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return new KTParam();
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
public class KTBaseBean {
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamDataBean;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class KTDataUtil {
|
||||
private static Map<Integer, ParamDataBean> dataInfo = new HashMap<>();
|
||||
|
||||
public static void addUserDataInfo(int uid,ParamDataBean paramDataBean){
|
||||
dataInfo.put(uid,paramDataBean);
|
||||
}
|
||||
public static ParamDataBean getUserDataInfoById(int uid){
|
||||
if(dataInfo.containsKey(uid)){
|
||||
return dataInfo.get(uid);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamEnvironmentBean;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamEnvironmentSimpleBean;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class KTEnvironmentUtil {
|
||||
|
||||
public static Map<Integer, ParamEnvironmentBean> environmentInfo = new HashMap<>();
|
||||
|
||||
public static Map<Integer, ParamEnvironmentSimpleBean> environmentSimpleInfo = new HashMap<>();
|
||||
|
||||
public static void addUserEnviromentInfo(int uid,ParamEnvironmentBean paramEnvironmentBean){
|
||||
environmentInfo.put(uid,paramEnvironmentBean);
|
||||
}
|
||||
public static ParamEnvironmentBean getUserEnviromentInfoById(int uid){
|
||||
if(environmentInfo.containsKey(uid)){
|
||||
return environmentInfo.get(uid);
|
||||
}
|
||||
return new ParamEnvironmentBean();
|
||||
}
|
||||
|
||||
public static void addUserSimpleEnviromentInfo(int uid,ParamEnvironmentSimpleBean paramEnvironmentSimpleBean){
|
||||
environmentSimpleInfo.put(uid,paramEnvironmentSimpleBean);
|
||||
}
|
||||
public static ParamEnvironmentSimpleBean getUserSimpleEnviromentInfoById(int uid){
|
||||
if(environmentSimpleInfo.containsKey(uid)){
|
||||
return environmentSimpleInfo.get(uid);
|
||||
}
|
||||
return new ParamEnvironmentSimpleBean();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
public class KTParam {
|
||||
}
|
||||
|
|
@ -0,0 +1,121 @@
|
|||
package com.ljsd.jieling.ktbeans.KTRequestBeans;
|
||||
|
||||
public class LoginRequest {
|
||||
private String device_id_s; //设备唯一标识，必须添加该字段
|
||||
private String idfa_sOr_imei_s; //苹果 安卓设备唯一标识吗
|
||||
private String brand_type_s; //设备机型类型
|
||||
private String brand_s; //设备机型名称
|
||||
private String os_version_s; //设备使用系统版本号
|
||||
private String dpi_s; //设备分辨率
|
||||
private String device_screen_size_s; //设备屏幕尺寸
|
||||
private String operator_s; //设备对应运营商类型
|
||||
private String network_s; //设备对应网络类型
|
||||
private String ip_s ; //IP
|
||||
private String openId ; //openID
|
||||
private String channel_s; //渠道 ID
|
||||
private String platform_s;// 平台类型
|
||||
|
||||
public String getDevice_id_s() {
|
||||
return device_id_s;
|
||||
}
|
||||
|
||||
public String getIdfa_sOr_imei_s() {
|
||||
return idfa_sOr_imei_s;
|
||||
}
|
||||
|
||||
public String getBrand_type_s() {
|
||||
return brand_type_s;
|
||||
}
|
||||
|
||||
public String getBrand_s() {
|
||||
return brand_s;
|
||||
}
|
||||
|
||||
public String getOs_version_s() {
|
||||
return os_version_s;
|
||||
}
|
||||
|
||||
public String getDpi_s() {
|
||||
return dpi_s;
|
||||
}
|
||||
|
||||
public String getDevice_screen_size_s() {
|
||||
return device_screen_size_s;
|
||||
}
|
||||
|
||||
public String getOperator_s() {
|
||||
return operator_s;
|
||||
}
|
||||
|
||||
public String getNetwork_s() {
|
||||
return network_s;
|
||||
}
|
||||
|
||||
public String getIp_s() {
|
||||
return ip_s;
|
||||
}
|
||||
|
||||
public String getOpenId() {
|
||||
return openId;
|
||||
}
|
||||
|
||||
public String getChannel_s() {
|
||||
return channel_s;
|
||||
}
|
||||
|
||||
public String getPlatform_s() {
|
||||
return platform_s;
|
||||
}
|
||||
|
||||
public void setDevice_id_s(String device_id_s) {
|
||||
this.device_id_s = device_id_s;
|
||||
}
|
||||
|
||||
public void setIdfa_sOr_imei_s(String idfa_sOr_imei_s) {
|
||||
this.idfa_sOr_imei_s = idfa_sOr_imei_s;
|
||||
}
|
||||
|
||||
public void setBrand_type_s(String brand_type_s) {
|
||||
this.brand_type_s = brand_type_s;
|
||||
}
|
||||
|
||||
public void setBrand_s(String brand_s) {
|
||||
this.brand_s = brand_s;
|
||||
}
|
||||
|
||||
public void setOs_version_s(String os_version_s) {
|
||||
this.os_version_s = os_version_s;
|
||||
}
|
||||
|
||||
public void setDpi_s(String dpi_s) {
|
||||
this.dpi_s = dpi_s;
|
||||
}
|
||||
|
||||
public void setDevice_screen_size_s(String device_screen_size_s) {
|
||||
this.device_screen_size_s = device_screen_size_s;
|
||||
}
|
||||
|
||||
public void setOperator_s(String operator_s) {
|
||||
this.operator_s = operator_s;
|
||||
}
|
||||
|
||||
public void setNetwork_s(String network_s) {
|
||||
this.network_s = network_s;
|
||||
}
|
||||
|
||||
public void setIp_s(String ip_s) {
|
||||
this.ip_s = ip_s;
|
||||
}
|
||||
|
||||
public void setOpenId(String openId) {
|
||||
this.openId = openId;
|
||||
}
|
||||
|
||||
public void setChannel_s(String channel_s) {
|
||||
this.channel_s = channel_s;
|
||||
}
|
||||
|
||||
public void setPlatform_s(String platform_s) {
|
||||
this.platform_s = platform_s;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleActivity {
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleCurrency {
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleItem {
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleLogin {
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleMall {
|
||||
|
||||
/**
|
||||
* param_data : {"app_id_s":"game_skuld_01","app_version_name_s":"1.0.0.5","app_version_code_s":"10000","category_s":"event_role","platform_s":"ADR","region_s":"4","server_s":"44","channel_s":"4","data_unix":1511767867}
|
||||
* param_environment : {"device_id_s":"6778","ip_s":"61.4.69.112"}
|
||||
* param_user : {"user_id_s":"渠道授予用户 ID","account_id_s":"游戏内部授予用户 ID"}
|
||||
* param_role : {"role_id_s":"1144","role_name_s":"沫沫★殿下","role_class_s":"3","level_i":"40","rebirth_level_i":"2","transfer_level_i":"2","fighting_l":"7442","map_s":"2887771852","sex_s":"W","vip_level_i":1}
|
||||
* param_event : {"event_s":["mall_3_l_d_d","商城 cmid","道具 id","虚拟币类型","数量","单价","总价"]}
|
||||
*/
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRolePay {
|
||||
|
||||
/**
|
||||
* param_data : {"app_id_s":"game_skuld_01","app_version_name_s":"1.0.0.5","app_version_code_s":"10000","category_s":"event_role","platform_s":"ADR","region_s":"4","server_s":"44","channel_s":"4","data_unix":1511767867}
|
||||
* param_environment : {"device_id_s":"6778","ip_s":"61.4.69.112"}
|
||||
* param_user : {"user_id_s":"渠道授予用户 ID","account_id_s":"游戏内部授予用户 ID"}
|
||||
* param_role : {"role_id_s":"1144","role_name_s":"沫沫★殿下","role_class_s":"3","level_i":"40","rebirth_level_i":"2","transfer_level_i":"2","fighting_l":"7442","map_s":"2887771852","sex_s":"W","vip_level_i":1}
|
||||
* param_event : {"event_s":["pay_3_d","IN_GAME","e0a18b5c-ad59-4003-8103-120e16a72ee3","VALID","10"]}
|
||||
*/
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleRegister {
|
||||
|
||||
|
||||
/**
|
||||
* param_data : {"app_id_s":"game_skuld_01","app_version_name_s":"1.0.0.5","app_version_code_s":"10000","category_s":"event_role","platform_s":"ADR","region_s":"4","server_s":"44","channel_s":"4","data_unix":1511767867}
|
||||
* param_environment : {"device_id_s":"6778","ip_s":"61.4.69.112"}
|
||||
* param_user : {"user_id_s":"渠道授予用户 ID","account_id_s":"游戏内部授予用户 ID"}
|
||||
* param_role : {"role_id_s":"1144","role_name_s":"沫沫★殿下","role_class_s":"3","level_i":"40","rebirth_level_i":"2","transfer_level_i":"2","fighting_l":"7442","map_s":"2887771852","sex_s":"W","vip_level_i":1}
|
||||
* param_event : {"event_s":["register_0"]}
|
||||
*/
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleTask {
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamRoleBean;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class KTRoleUtil {
|
||||
public static ParamRoleBean getRoleById(User user){
|
||||
ParamRoleBean paramRoleBean = new ParamRoleBean();
|
||||
paramRoleBean.setRole_id_s(String.valueOf(user.getId()));
|
||||
paramRoleBean.setRole_name_s(user.getPlayerInfoManager().getNickName());
|
||||
paramRoleBean.setLevel_i(String.valueOf(user.getPlayerInfoManager().getLevel()));
|
||||
paramRoleBean.setVip_level_i(user.getPlayerInfoManager().getVipLevel());
|
||||
return paramRoleBean;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
public interface KTStaticUtil {
|
||||
|
||||
static void add(int uid,KTBaseBean ktBaseBean){}
|
||||
|
||||
static KTBaseBean get(int uid){ return null;}
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
import com.ljsd.jieling.globals.Global;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamSimpleUserBean;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamUserBean;
|
||||
import com.ljsd.jieling.logic.dao.Item;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class KTUserUtil implements KTStaticUtil{
|
||||
public static ParamUserBean getUserById(User user){
|
||||
ParamUserBean paramUserBean = new ParamUserBean();
|
||||
paramUserBean.setUser_id_s(user.getPlayerInfoManager().getOpenId());
|
||||
paramUserBean.setAccount_id_s(String.valueOf(user.getId()));
|
||||
return paramUserBean;
|
||||
}
|
||||
|
||||
public static ParamSimpleUserBean getSimpleUserById(User user){
|
||||
ParamSimpleUserBean paramSimpleUserBean = new ParamSimpleUserBean();
|
||||
paramSimpleUserBean.setUser_id_s(user.getPlayerInfoManager().getOpenId());
|
||||
paramSimpleUserBean.setAccount_id_s(String.valueOf(user.getId()));
|
||||
Item gem = user.getItemManager().getItemMap().get(Global.GEM);
|
||||
int gemNum = 0;
|
||||
if(gem != null){
|
||||
gemNum = gem.getItemNum();
|
||||
}
|
||||
|
||||
Item gold = user.getItemManager().getItemMap().get(Global.GEM);
|
||||
int goldNum = 0;
|
||||
if(gold != null){
|
||||
goldNum = gold.getItemNum();
|
||||
}
|
||||
paramSimpleUserBean.setCurrency_1_d(String.valueOf(gemNum));
|
||||
paramSimpleUserBean.setCurrency_1_d(String.valueOf(goldNum));
|
||||
return paramSimpleUserBean;
|
||||
}
|
||||
}
|
||||
|
|
@ -2,10 +2,12 @@ package com.ljsd.jieling.ktbeans;
|
|||
|
||||
import com.google.gson.Gson;
|
||||
import com.ljsd.jieling.config.SGlobalActivity;
|
||||
import com.ljsd.jieling.config.reportData.DataMessageUtils;
|
||||
import com.ljsd.jieling.globals.Global;
|
||||
import com.ljsd.jieling.ktbeans.BeanBuilder.ParamBuilder;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
|
@ -89,7 +91,32 @@ public class KtEventUtils {
|
|||
break;
|
||||
|
||||
}
|
||||
|
||||
KTParam ktParam = ParamBuilder.paramBuild(user, eventType, paramEventBean);
|
||||
DataMessageUtils.addLogQueue(ktParam);
|
||||
LOGGER.info("ktparm -- > {}",gson.toJson(ktParam));
|
||||
|
||||
}
|
||||
public static ParamEnvironmentBean enviromentBuild(int uid){
|
||||
return KTEnvironmentUtil.getUserEnviromentInfoById(uid);
|
||||
}
|
||||
public static ParamEnvironmentSimpleBean simpleEnviromentBuild(int uid){
|
||||
return KTEnvironmentUtil.getUserSimpleEnviromentInfoById(uid);
|
||||
}
|
||||
public static ParamDataBean dataBuild(int uid){
|
||||
return KTDataUtil.getUserDataInfoById(uid);
|
||||
}
|
||||
public static ParamUserBean userBuild(User user){
|
||||
return KTUserUtil.getUserById(user);
|
||||
}
|
||||
|
||||
public static ParamSimpleUserBean userSimpleBuild(User user){
|
||||
return KTUserUtil.getSimpleUserById(user);
|
||||
}
|
||||
public static ParamRoleBean roleBuild(User user){
|
||||
return KTRoleUtil.getRoleById(user);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ public class ParamDataBean {
|
|||
*/
|
||||
|
||||
private String app_id_s;
|
||||
private String app_version_name_s;
|
||||
private String app_version_code_s;
|
||||
private String category_s;
|
||||
private String platform_s;
|
||||
private String region_s;
|
||||
|
|
@ -34,22 +32,6 @@ public class ParamDataBean {
|
|||
this.app_id_s = app_id_s;
|
||||
}
|
||||
|
||||
public String getApp_version_name_s() {
|
||||
return app_version_name_s;
|
||||
}
|
||||
|
||||
public void setApp_version_name_s(String app_version_name_s) {
|
||||
this.app_version_name_s = app_version_name_s;
|
||||
}
|
||||
|
||||
public String getApp_version_code_s() {
|
||||
return app_version_code_s;
|
||||
}
|
||||
|
||||
public void setApp_version_code_s(String app_version_code_s) {
|
||||
this.app_version_code_s = app_version_code_s;
|
||||
}
|
||||
|
||||
public String getCategory_s() {
|
||||
return category_s;
|
||||
}
|
||||
|
|
@ -99,6 +81,12 @@ public class ParamDataBean {
|
|||
}
|
||||
|
||||
public ParamDataBean(){
|
||||
|
||||
this.app_id_s="game_skuld_01";
|
||||
this.category_s="event_role";
|
||||
this.platform_s="ADR";
|
||||
this.region_s="4";
|
||||
this.server_s="44";
|
||||
this.channel_s="4";
|
||||
this.data_unix=1511767867;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
package com.ljsd.jieling.ktbeans.parmsBean;
|
||||
|
||||
public class ParamEnvironmentSimpleBean extends ParamEnvironmentBean{
|
||||
|
||||
private String idfa_s; // ios设备唯一标识，必须添加该字段
|
||||
private String imei_s;// 安卓设备唯一标识，必须添加该字段
|
||||
private String app_device_id_s;
|
||||
private String brand_s;
|
||||
private String dpi_s;
|
||||
private String operator_s;
|
||||
private String os_version_s;
|
||||
private boolean wifi_b;
|
||||
|
||||
public String getIdfa_s() {
|
||||
return idfa_s;
|
||||
}
|
||||
|
||||
public String getImei_s() {
|
||||
return imei_s;
|
||||
}
|
||||
|
||||
public String getApp_device_id_s() {
|
||||
return app_device_id_s;
|
||||
}
|
||||
|
||||
public String getBrand_s() {
|
||||
return brand_s;
|
||||
}
|
||||
|
||||
public String getDpi_s() {
|
||||
return dpi_s;
|
||||
}
|
||||
|
||||
public String getOperator_s() {
|
||||
return operator_s;
|
||||
}
|
||||
|
||||
public String getOs_version_s() {
|
||||
return os_version_s;
|
||||
}
|
||||
|
||||
public boolean isWifi_b() {
|
||||
return wifi_b;
|
||||
}
|
||||
|
||||
public void setIdfa_s(String idfa_s) {
|
||||
this.idfa_s = idfa_s;
|
||||
}
|
||||
|
||||
public void setImei_s(String imei_s) {
|
||||
this.imei_s = imei_s;
|
||||
}
|
||||
|
||||
public void setApp_device_id_s(String app_device_id_s) {
|
||||
this.app_device_id_s = app_device_id_s;
|
||||
}
|
||||
|
||||
public void setBrand_s(String brand_s) {
|
||||
this.brand_s = brand_s;
|
||||
}
|
||||
|
||||
public void setDpi_s(String dpi_s) {
|
||||
this.dpi_s = dpi_s;
|
||||
}
|
||||
|
||||
public void setOperator_s(String operator_s) {
|
||||
this.operator_s = operator_s;
|
||||
}
|
||||
|
||||
public void setOs_version_s(String os_version_s) {
|
||||
this.os_version_s = os_version_s;
|
||||
}
|
||||
|
||||
public void setWifi_b(boolean wifi_b) {
|
||||
this.wifi_b = wifi_b;
|
||||
}
|
||||
}
|
||||
|
|
@ -19,7 +19,6 @@ public class ParamRoleBean {
|
|||
|
||||
private String role_id_s;
|
||||
private String role_name_s;
|
||||
private String role_class_s;
|
||||
private String level_i;
|
||||
private int vip_level_i;
|
||||
|
||||
|
|
@ -39,14 +38,6 @@ public class ParamRoleBean {
|
|||
this.role_name_s = role_name_s;
|
||||
}
|
||||
|
||||
public String getRole_class_s() {
|
||||
return role_class_s;
|
||||
}
|
||||
|
||||
public void setRole_class_s(String role_class_s) {
|
||||
this.role_class_s = role_class_s;
|
||||
}
|
||||
|
||||
public String getLevel_i() {
|
||||
return level_i;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
package com.ljsd.jieling.ktbeans.parmsBean;
|
||||
|
||||
public class ParamSimpleUserBean extends ParamUserBean{
|
||||
private String currency_1_d;
|
||||
private String currency_2_d;
|
||||
|
||||
|
||||
public String getCurrency_1_d() {
|
||||
return currency_1_d;
|
||||
}
|
||||
|
||||
public void setCurrency_1_d(String currency_1_d) {
|
||||
this.currency_1_d = currency_1_d;
|
||||
}
|
||||
|
||||
public String getCurrency_2_d() {
|
||||
return currency_2_d;
|
||||
}
|
||||
|
||||
public void setCurrency_2_d(String currency_2_d) {
|
||||
this.currency_2_d = currency_2_d;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +1,11 @@
|
|||
package com.ljsd.jieling.ktbeans.parmsBean;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTBaseBean;
|
||||
|
||||
/**
|
||||
* 用户参数
|
||||
*/
|
||||
public class ParamUserBean {
|
||||
public class ParamUserBean extends KTBaseBean{
|
||||
/**
|
||||
* user_id_s : 渠道授予用户 ID openId
|
||||
* account_id_s : 游戏内部授予用户 ID
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
package com.ljsd.jieling.ktbeans.sendbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamDataBean;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
|
||||
|
||||
public class KTAppOnline {
|
||||
public class KTAppOnline extends KTParam {
|
||||
private ParamDataBean param_data;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
package com.ljsd.jieling.ktbeans.sendbeans;
|
||||
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleActivity extends KTParam {
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
public ParamDataBean getParam_data() {
|
||||
return param_data;
|
||||
}
|
||||
|
||||
public ParamEnvironmentBean getParam_environment() {
|
||||
return param_environment;
|
||||
}
|
||||
|
||||
public ParamUserBean getParam_user() {
|
||||
return param_user;
|
||||
}
|
||||
|
||||
public ParamRoleBean getParam_role() {
|
||||
return param_role;
|
||||
}
|
||||
|
||||
public ParamEventBean getParam_event() {
|
||||
return param_event;
|
||||
}
|
||||
|
||||
public void setParam_data(ParamDataBean param_data) {
|
||||
this.param_data = param_data;
|
||||
}
|
||||
|
||||
public void setParam_environment(ParamEnvironmentBean param_environment) {
|
||||
this.param_environment = param_environment;
|
||||
}
|
||||
|
||||
public void setParam_user(ParamUserBean param_user) {
|
||||
this.param_user = param_user;
|
||||
}
|
||||
|
||||
public void setParam_role(ParamRoleBean param_role) {
|
||||
this.param_role = param_role;
|
||||
}
|
||||
|
||||
public void setParam_event(ParamEventBean param_event) {
|
||||
this.param_event = param_event;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
package com.ljsd.jieling.ktbeans.sendbeans;
|
||||
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleCurrency extends KTParam {
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
public ParamDataBean getParam_data() {
|
||||
return param_data;
|
||||
}
|
||||
|
||||
public ParamEnvironmentBean getParam_environment() {
|
||||
return param_environment;
|
||||
}
|
||||
|
||||
public ParamUserBean getParam_user() {
|
||||
return param_user;
|
||||
}
|
||||
|
||||
public ParamRoleBean getParam_role() {
|
||||
return param_role;
|
||||
}
|
||||
|
||||
public ParamEventBean getParam_event() {
|
||||
return param_event;
|
||||
}
|
||||
|
||||
public void setParam_data(ParamDataBean param_data) {
|
||||
this.param_data = param_data;
|
||||
}
|
||||
|
||||
public void setParam_environment(ParamEnvironmentBean param_environment) {
|
||||
this.param_environment = param_environment;
|
||||
}
|
||||
|
||||
public void setParam_user(ParamUserBean param_user) {
|
||||
this.param_user = param_user;
|
||||
}
|
||||
|
||||
public void setParam_role(ParamRoleBean param_role) {
|
||||
this.param_role = param_role;
|
||||
}
|
||||
|
||||
public void setParam_event(ParamEventBean param_event) {
|
||||
this.param_event = param_event;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
package com.ljsd.jieling.ktbeans.sendbeans;
|
||||
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleItem extends KTParam {
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
public ParamDataBean getParam_data() {
|
||||
return param_data;
|
||||
}
|
||||
|
||||
public ParamEnvironmentBean getParam_environment() {
|
||||
return param_environment;
|
||||
}
|
||||
|
||||
public ParamUserBean getParam_user() {
|
||||
return param_user;
|
||||
}
|
||||
|
||||
public ParamRoleBean getParam_role() {
|
||||
return param_role;
|
||||
}
|
||||
|
||||
public ParamEventBean getParam_event() {
|
||||
return param_event;
|
||||
}
|
||||
|
||||
public void setParam_data(ParamDataBean param_data) {
|
||||
this.param_data = param_data;
|
||||
}
|
||||
|
||||
public void setParam_environment(ParamEnvironmentBean param_environment) {
|
||||
this.param_environment = param_environment;
|
||||
}
|
||||
|
||||
public void setParam_user(ParamUserBean param_user) {
|
||||
this.param_user = param_user;
|
||||
}
|
||||
|
||||
public void setParam_role(ParamRoleBean param_role) {
|
||||
this.param_role = param_role;
|
||||
}
|
||||
|
||||
public void setParam_event(ParamEventBean param_event) {
|
||||
this.param_event = param_event;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
package com.ljsd.jieling.ktbeans.sendbeans;
|
||||
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleLogin extends KTParam {
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
public ParamDataBean getParam_data() {
|
||||
return param_data;
|
||||
}
|
||||
|
||||
public ParamEnvironmentBean getParam_environment() {
|
||||
return param_environment;
|
||||
}
|
||||
|
||||
public ParamUserBean getParam_user() {
|
||||
return param_user;
|
||||
}
|
||||
|
||||
public ParamRoleBean getParam_role() {
|
||||
return param_role;
|
||||
}
|
||||
|
||||
public ParamEventBean getParam_event() {
|
||||
return param_event;
|
||||
}
|
||||
|
||||
public void setParam_data(ParamDataBean param_data) {
|
||||
this.param_data = param_data;
|
||||
}
|
||||
|
||||
public void setParam_environment(ParamEnvironmentBean param_environment) {
|
||||
this.param_environment = param_environment;
|
||||
}
|
||||
|
||||
public void setParam_user(ParamUserBean param_user) {
|
||||
this.param_user = param_user;
|
||||
}
|
||||
|
||||
public void setParam_role(ParamRoleBean param_role) {
|
||||
this.param_role = param_role;
|
||||
}
|
||||
|
||||
public void setParam_event(ParamEventBean param_event) {
|
||||
this.param_event = param_event;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
package com.ljsd.jieling.ktbeans.sendbeans;
|
||||
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleMall extends KTParam {
|
||||
|
||||
/**
|
||||
* param_data : {"app_id_s":"game_skuld_01","app_version_name_s":"1.0.0.5","app_version_code_s":"10000","category_s":"event_role","platform_s":"ADR","region_s":"4","server_s":"44","channel_s":"4","data_unix":1511767867}
|
||||
* param_environment : {"device_id_s":"6778","ip_s":"61.4.69.112"}
|
||||
* param_user : {"user_id_s":"渠道授予用户 ID","account_id_s":"游戏内部授予用户 ID"}
|
||||
* param_role : {"role_id_s":"1144","role_name_s":"沫沫★殿下","role_class_s":"3","level_i":"40","rebirth_level_i":"2","transfer_level_i":"2","fighting_l":"7442","map_s":"2887771852","sex_s":"W","vip_level_i":1}
|
||||
* param_event : {"event_s":["mall_3_l_d_d","商城 cmid","道具 id","虚拟币类型","数量","单价","总价"]}
|
||||
*/
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
public ParamDataBean getParam_data() {
|
||||
return param_data;
|
||||
}
|
||||
|
||||
public ParamEnvironmentBean getParam_environment() {
|
||||
return param_environment;
|
||||
}
|
||||
|
||||
public ParamUserBean getParam_user() {
|
||||
return param_user;
|
||||
}
|
||||
|
||||
public ParamRoleBean getParam_role() {
|
||||
return param_role;
|
||||
}
|
||||
|
||||
public ParamEventBean getParam_event() {
|
||||
return param_event;
|
||||
}
|
||||
|
||||
public void setParam_data(ParamDataBean param_data) {
|
||||
this.param_data = param_data;
|
||||
}
|
||||
|
||||
public void setParam_environment(ParamEnvironmentBean param_environment) {
|
||||
this.param_environment = param_environment;
|
||||
}
|
||||
|
||||
public void setParam_user(ParamUserBean param_user) {
|
||||
this.param_user = param_user;
|
||||
}
|
||||
|
||||
public void setParam_role(ParamRoleBean param_role) {
|
||||
this.param_role = param_role;
|
||||
}
|
||||
|
||||
public void setParam_event(ParamEventBean param_event) {
|
||||
this.param_event = param_event;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
package com.ljsd.jieling.ktbeans.sendbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRolePay extends KTParam {
|
||||
|
||||
/**
|
||||
* param_data : {"app_id_s":"game_skuld_01","app_version_name_s":"1.0.0.5","app_version_code_s":"10000","category_s":"event_role","platform_s":"ADR","region_s":"4","server_s":"44","channel_s":"4","data_unix":1511767867}
|
||||
* param_environment : {"device_id_s":"6778","ip_s":"61.4.69.112"}
|
||||
* param_user : {"user_id_s":"渠道授予用户 ID","account_id_s":"游戏内部授予用户 ID"}
|
||||
* param_role : {"role_id_s":"1144","role_name_s":"沫沫★殿下","role_class_s":"3","level_i":"40","rebirth_level_i":"2","transfer_level_i":"2","fighting_l":"7442","map_s":"2887771852","sex_s":"W","vip_level_i":1}
|
||||
* param_event : {"event_s":["pay_3_d","IN_GAME","e0a18b5c-ad59-4003-8103-120e16a72ee3","VALID","10"]}
|
||||
*/
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
public ParamDataBean getParam_data() {
|
||||
return param_data;
|
||||
}
|
||||
|
||||
public ParamEnvironmentBean getParam_environment() {
|
||||
return param_environment;
|
||||
}
|
||||
|
||||
public ParamUserBean getParam_user() {
|
||||
return param_user;
|
||||
}
|
||||
|
||||
public ParamRoleBean getParam_role() {
|
||||
return param_role;
|
||||
}
|
||||
|
||||
public ParamEventBean getParam_event() {
|
||||
return param_event;
|
||||
}
|
||||
|
||||
public void setParam_data(ParamDataBean param_data) {
|
||||
this.param_data = param_data;
|
||||
}
|
||||
|
||||
public void setParam_environment(ParamEnvironmentBean param_environment) {
|
||||
this.param_environment = param_environment;
|
||||
}
|
||||
|
||||
public void setParam_user(ParamUserBean param_user) {
|
||||
this.param_user = param_user;
|
||||
}
|
||||
|
||||
public void setParam_role(ParamRoleBean param_role) {
|
||||
this.param_role = param_role;
|
||||
}
|
||||
|
||||
public void setParam_event(ParamEventBean param_event) {
|
||||
this.param_event = param_event;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
package com.ljsd.jieling.ktbeans.sendbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleRegister extends KTParam {
|
||||
|
||||
|
||||
/**
|
||||
* param_data : {"app_id_s":"game_skuld_01","app_version_name_s":"1.0.0.5","app_version_code_s":"10000","category_s":"event_role","platform_s":"ADR","region_s":"4","server_s":"44","channel_s":"4","data_unix":1511767867}
|
||||
* param_environment : {"device_id_s":"6778","ip_s":"61.4.69.112"}
|
||||
* param_user : {"user_id_s":"渠道授予用户 ID","account_id_s":"游戏内部授予用户 ID"}
|
||||
* param_role : {"role_id_s":"1144","role_name_s":"沫沫★殿下","role_class_s":"3","level_i":"40","rebirth_level_i":"2","transfer_level_i":"2","fighting_l":"7442","map_s":"2887771852","sex_s":"W","vip_level_i":1}
|
||||
* param_event : {"event_s":["register_0"]}
|
||||
*/
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
public ParamDataBean getParam_data() {
|
||||
return param_data;
|
||||
}
|
||||
|
||||
public ParamEnvironmentBean getParam_environment() {
|
||||
return param_environment;
|
||||
}
|
||||
|
||||
public ParamUserBean getParam_user() {
|
||||
return param_user;
|
||||
}
|
||||
|
||||
public ParamRoleBean getParam_role() {
|
||||
return param_role;
|
||||
}
|
||||
|
||||
public ParamEventBean getParam_event() {
|
||||
return param_event;
|
||||
}
|
||||
|
||||
public void setParam_data(ParamDataBean param_data) {
|
||||
this.param_data = param_data;
|
||||
}
|
||||
|
||||
public void setParam_environment(ParamEnvironmentBean param_environment) {
|
||||
this.param_environment = param_environment;
|
||||
}
|
||||
|
||||
public void setParam_user(ParamUserBean param_user) {
|
||||
this.param_user = param_user;
|
||||
}
|
||||
|
||||
public void setParam_role(ParamRoleBean param_role) {
|
||||
this.param_role = param_role;
|
||||
}
|
||||
|
||||
public void setParam_event(ParamEventBean param_event) {
|
||||
this.param_event = param_event;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
package com.ljsd.jieling.ktbeans.sendbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KTRoleTask extends KTParam {
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
public ParamDataBean getParam_data() {
|
||||
return param_data;
|
||||
}
|
||||
|
||||
public ParamEnvironmentBean getParam_environment() {
|
||||
return param_environment;
|
||||
}
|
||||
|
||||
public ParamUserBean getParam_user() {
|
||||
return param_user;
|
||||
}
|
||||
|
||||
public ParamRoleBean getParam_role() {
|
||||
return param_role;
|
||||
}
|
||||
|
||||
public ParamEventBean getParam_event() {
|
||||
return param_event;
|
||||
}
|
||||
|
||||
public void setParam_data(ParamDataBean param_data) {
|
||||
this.param_data = param_data;
|
||||
}
|
||||
|
||||
public void setParam_environment(ParamEnvironmentBean param_environment) {
|
||||
this.param_environment = param_environment;
|
||||
}
|
||||
|
||||
public void setParam_user(ParamUserBean param_user) {
|
||||
this.param_user = param_user;
|
||||
}
|
||||
|
||||
public void setParam_role(ParamRoleBean param_role) {
|
||||
this.param_role = param_role;
|
||||
}
|
||||
|
||||
public void setParam_event(ParamEventBean param_event) {
|
||||
this.param_event = param_event;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
package com.ljsd.jieling.ktbeans.sendbeans;
|
||||
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.*;
|
||||
|
||||
public class KtUserLogin extends KTParam {
|
||||
|
||||
private ParamDataBean param_data;
|
||||
private ParamEnvironmentBean param_environment;
|
||||
private ParamUserBean param_user;
|
||||
private ParamRoleBean param_role;
|
||||
private ParamEventBean param_event;
|
||||
|
||||
public ParamDataBean getParam_data() {
|
||||
return param_data;
|
||||
}
|
||||
|
||||
public ParamEnvironmentBean getParam_environment() {
|
||||
return param_environment;
|
||||
}
|
||||
|
||||
public ParamUserBean getParam_user() {
|
||||
return param_user;
|
||||
}
|
||||
|
||||
public ParamRoleBean getParam_role() {
|
||||
return param_role;
|
||||
}
|
||||
|
||||
public ParamEventBean getParam_event() {
|
||||
return param_event;
|
||||
}
|
||||
|
||||
public void setParam_data(ParamDataBean param_data) {
|
||||
this.param_data = param_data;
|
||||
}
|
||||
|
||||
public void setParam_environment(ParamEnvironmentBean param_environment) {
|
||||
this.param_environment = param_environment;
|
||||
}
|
||||
|
||||
public void setParam_user(ParamUserBean param_user) {
|
||||
this.param_user = param_user;
|
||||
}
|
||||
|
||||
public void setParam_role(ParamRoleBean param_role) {
|
||||
this.param_role = param_role;
|
||||
}
|
||||
|
||||
public void setParam_event(ParamEventBean param_event) {
|
||||
this.param_event = param_event;
|
||||
}
|
||||
}
|
||||
|
|
@ -140,6 +140,7 @@ public class GlobalDataManaager {
|
|||
}
|
||||
closeAction(closeList);
|
||||
updateGetFunctionOfTimeResponse();
|
||||
|
||||
}
|
||||
|
||||
public void openAction(List<Integer> ids){
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ public class CombatLogic {
|
|||
if(randomTimes>0){
|
||||
int bossGroupId = randomInvasionBoss(uid, adventureStateInfo.getPosition(),randomTimes,false);
|
||||
if(bossGroupId>0){
|
||||
remainTime =sAdventureConfig.getInvasionBossHolding();
|
||||
remainTime =sAdventureConfig.getInvasionBossHolding()-(now-adventureStateInfo.getFindBossTime());
|
||||
nextFlushTime+=remainTime+nextFlushTime;
|
||||
need=true;
|
||||
}
|
||||
|
|
@ -555,15 +555,19 @@ public class CombatLogic {
|
|||
bossGroupID = item[0];
|
||||
break;
|
||||
}
|
||||
totalWeight+=item[1];
|
||||
}
|
||||
}
|
||||
int findBossTime = adventureStateInfo.getFindBossTime();
|
||||
int now=0;
|
||||
if(isGm || findBossTime == 0){
|
||||
now = (int)(System.currentTimeMillis()/1000);
|
||||
int now = (int)(System.currentTimeMillis()/1000);
|
||||
if(isGm || bossGroupID == 0 || findBossTime == 0){
|
||||
|
||||
}else{
|
||||
now = findBossTime + sAdventureConfig.getInvasionBossHolding() * (randomTimes - reallyRandomTimes);
|
||||
int nextFindTime = findBossTime + sAdventureConfig.getInvasionBossRefresh() * (randomTimes - reallyRandomTimes);
|
||||
if(nextFindTime>now || (now - nextFindTime) > sAdventureConfig.getInvasionBossHolding() ){
|
||||
|
||||
}else{
|
||||
now=nextFindTime;
|
||||
}
|
||||
}
|
||||
String bossId="";
|
||||
if(bossGroupID != 0){
|
||||
|
|
|
|||
|
|
@ -4,19 +4,17 @@ import com.ljsd.jieling.config.reportData.DataMessageUtils;
|
|||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.handler.map.MapLogic;
|
||||
import com.ljsd.jieling.ktbeans.BeanBuilder.KtBeanBuilderUtils;
|
||||
import com.ljsd.jieling.ktbeans.KTAppOnline;
|
||||
import com.ljsd.jieling.ktbeans.sendbeans.KTAppOnline;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
|
||||
import com.ljsd.jieling.logic.GlobalDataManaager;
|
||||
import com.ljsd.jieling.logic.OnlineUserManager;
|
||||
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
||||
import com.ljsd.jieling.logic.arena.ArenaLogic;
|
||||
import com.ljsd.jieling.logic.fight.CombatLogic;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Map;
|
||||
|
||||
public class MinuteTask extends Thread {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(MinuteTask.class);
|
||||
|
|
|
|||
Loading…
Reference in New Issue