back_recharge
jiahuiwen 2019-01-04 18:24:06 +08:00
commit 0105f964ed
27 changed files with 10996 additions and 2979 deletions

View File

@ -1,2 +0,0 @@
#Thu Dec 13 11:30:27 CST 2018
gradle.version=4.8

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel>
<module name="jieling-server_main" target="1.8" />
<module name="jieling-server_test" target="1.8" />
</bytecodeTargetLevel>
</component>
</project>

View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/common" />
<option value="$PROJECT_DIR$/hotfix" />
<option value="$PROJECT_DIR$/netty" />
<option value="$PROJECT_DIR$/serverlogic" />
</set>
</option>
<option name="useAutoImport" value="true" />
</GradleProjectSettings>
</option>
</component>
</project>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

View File

@ -1,124 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,51 @@
package com.ljsd.jieling.logic;
import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.network.session.ISession;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class OnlineUserManager {
public static Map<Integer, Integer> onlineUidMap = new ConcurrentHashMap<>();
public static Map<Integer, ISession> sessionMap = new ConcurrentHashMap<>();
public static Map<Integer, PlayerInfo> onlineUserMap = new ConcurrentHashMap<>(10000);
public static void registUser(int uid, int serverId, ISession session) {
onlineUidMap.put(uid, serverId);
sessionMap.put(uid, session);
}
public static void unRegistUser(int uid) {
onlineUidMap.remove(uid);
sessionMap.remove(uid);
}
/**
* uidSession
* @param uid
* @return
*/
public static ISession getSessionByUid(int uid) {
if(sessionMap == null){
return null;
}
return sessionMap.get(uid);
}
/**
* 线
* @param uid
* @return
*/
public static boolean checkUidOnline(int uid) {
if(sessionMap == null){
return false;
}
return sessionMap.containsKey(uid);
}
}

View File

@ -0,0 +1,5 @@
package com.ljsd.jieling.logic.dao;
public class HeroManager {
}

View File

@ -0,0 +1,6 @@
package com.ljsd.jieling.logic.dao;
public class ItemManager {
}

View File

@ -0,0 +1,4 @@
package com.ljsd.jieling.logic.dao;
public class MapManager {
}

View File

@ -0,0 +1,14 @@
package com.ljsd.jieling.logic.dao;
public class PlayerInfo {
private UserManager userManager;
private ItemManager itemManager;
private HeroManager heroManager;
private MapManager mapManager;
}

View File

@ -0,0 +1,4 @@
package com.ljsd.jieling.logic.dao;
public class UserManager {
}

View File

@ -41,6 +41,94 @@ public final class MessageTypeProto {
* <code>LOGIN_RESPONSE = 10001;</code>
*/
LOGIN_RESPONSE(3, 10001),
/**
* <code>GET_PLAYERINFO_REQUEST = 10002;</code>
*
* <pre>
* </pre>
*/
GET_PLAYERINFO_REQUEST(4, 10002),
/**
* <code>GET_PLAYERINFO_RESPONSE = 10003;</code>
*/
GET_PLAYERINFO_RESPONSE(5, 10003),
/**
* <code>GET_HEROINFO_REQUEST = 10004;</code>
*
* <pre>
* </pre>
*/
GET_HEROINFO_REQUEST(6, 10004),
/**
* <code>GET_HEROINFO_RESPONSE = 10005;</code>
*/
GET_HEROINFO_RESPONSE(7, 10005),
/**
* <code>GET_ITEMINFO_REQUEST = 10006;</code>
*
* <pre>
* </pre>
*/
GET_ITEMINFO_REQUEST(8, 10006),
/**
* <code>GET_ITEMINFO_RESPONSE = 10007;</code>
*/
GET_ITEMINFO_RESPONSE(9, 10007),
/**
* <code>ENTER_MAP_REQUEST = 10008;</code>
*
* <pre>
* </pre>
*/
ENTER_MAP_REQUEST(10, 10008),
/**
* <code>ENTER_MAP_RESPONSE = 10009;</code>
*/
ENTER_MAP_RESPONSE(11, 10009),
/**
* <code>START_FIGHT_REQUEST = 10010;</code>
*
* <pre>
* </pre>
*/
START_FIGHT_REQUEST(12, 10010),
/**
* <code>START_FIGHT_RESPONSE = 10011;</code>
*/
START_FIGHT_RESPONSE(13, 10011),
/**
* <code>END_FIGHT_REQUEST = 10012;</code>
*
* <pre>
* </pre>
*/
END_FIGHT_REQUEST(14, 10012),
/**
* <code>END_FIGHT_RESPONSE = 10013;</code>
*/
END_FIGHT_RESPONSE(15, 10013),
/**
* <code>TRIGGER_EVENT_REQUEST = 10014;</code>
*
* <pre>
* </pre>
*/
TRIGGER_EVENT_REQUEST(16, 10014),
/**
* <code>TRIGGER_EVENT_RESPONSE = 10015;</code>
*/
TRIGGER_EVENT_RESPONSE(17, 10015),
/**
* <code>OUT_MAP_REQUEST = 10016;</code>
*
* <pre>
* </pre>
*/
OUT_MAP_REQUEST(18, 10016),
/**
* <code>OUT_MAP_RESPONSE = 10017;</code>
*/
OUT_MAP_RESPONSE(19, 10017),
;
/**
@ -71,6 +159,94 @@ public final class MessageTypeProto {
* <code>LOGIN_RESPONSE = 10001;</code>
*/
public static final int LOGIN_RESPONSE_VALUE = 10001;
/**
* <code>GET_PLAYERINFO_REQUEST = 10002;</code>
*
* <pre>
* </pre>
*/
public static final int GET_PLAYERINFO_REQUEST_VALUE = 10002;
/**
* <code>GET_PLAYERINFO_RESPONSE = 10003;</code>
*/
public static final int GET_PLAYERINFO_RESPONSE_VALUE = 10003;
/**
* <code>GET_HEROINFO_REQUEST = 10004;</code>
*
* <pre>
* </pre>
*/
public static final int GET_HEROINFO_REQUEST_VALUE = 10004;
/**
* <code>GET_HEROINFO_RESPONSE = 10005;</code>
*/
public static final int GET_HEROINFO_RESPONSE_VALUE = 10005;
/**
* <code>GET_ITEMINFO_REQUEST = 10006;</code>
*
* <pre>
* </pre>
*/
public static final int GET_ITEMINFO_REQUEST_VALUE = 10006;
/**
* <code>GET_ITEMINFO_RESPONSE = 10007;</code>
*/
public static final int GET_ITEMINFO_RESPONSE_VALUE = 10007;
/**
* <code>ENTER_MAP_REQUEST = 10008;</code>
*
* <pre>
* </pre>
*/
public static final int ENTER_MAP_REQUEST_VALUE = 10008;
/**
* <code>ENTER_MAP_RESPONSE = 10009;</code>
*/
public static final int ENTER_MAP_RESPONSE_VALUE = 10009;
/**
* <code>START_FIGHT_REQUEST = 10010;</code>
*
* <pre>
* </pre>
*/
public static final int START_FIGHT_REQUEST_VALUE = 10010;
/**
* <code>START_FIGHT_RESPONSE = 10011;</code>
*/
public static final int START_FIGHT_RESPONSE_VALUE = 10011;
/**
* <code>END_FIGHT_REQUEST = 10012;</code>
*
* <pre>
* </pre>
*/
public static final int END_FIGHT_REQUEST_VALUE = 10012;
/**
* <code>END_FIGHT_RESPONSE = 10013;</code>
*/
public static final int END_FIGHT_RESPONSE_VALUE = 10013;
/**
* <code>TRIGGER_EVENT_REQUEST = 10014;</code>
*
* <pre>
* </pre>
*/
public static final int TRIGGER_EVENT_REQUEST_VALUE = 10014;
/**
* <code>TRIGGER_EVENT_RESPONSE = 10015;</code>
*/
public static final int TRIGGER_EVENT_RESPONSE_VALUE = 10015;
/**
* <code>OUT_MAP_REQUEST = 10016;</code>
*
* <pre>
* </pre>
*/
public static final int OUT_MAP_REQUEST_VALUE = 10016;
/**
* <code>OUT_MAP_RESPONSE = 10017;</code>
*/
public static final int OUT_MAP_RESPONSE_VALUE = 10017;
public final int getNumber() { return value; }
@ -81,6 +257,22 @@ public final class MessageTypeProto {
case 1001: return HEART_BEAT_RESPONSE;
case 10000: return LOGIN_REQUEST;
case 10001: return LOGIN_RESPONSE;
case 10002: return GET_PLAYERINFO_REQUEST;
case 10003: return GET_PLAYERINFO_RESPONSE;
case 10004: return GET_HEROINFO_REQUEST;
case 10005: return GET_HEROINFO_RESPONSE;
case 10006: return GET_ITEMINFO_REQUEST;
case 10007: return GET_ITEMINFO_RESPONSE;
case 10008: return ENTER_MAP_REQUEST;
case 10009: return ENTER_MAP_RESPONSE;
case 10010: return START_FIGHT_REQUEST;
case 10011: return START_FIGHT_RESPONSE;
case 10012: return END_FIGHT_REQUEST;
case 10013: return END_FIGHT_RESPONSE;
case 10014: return TRIGGER_EVENT_REQUEST;
case 10015: return TRIGGER_EVENT_RESPONSE;
case 10016: return OUT_MAP_REQUEST;
case 10017: return OUT_MAP_RESPONSE;
default: return null;
}
}
@ -142,10 +334,20 @@ public final class MessageTypeProto {
static {
java.lang.String[] descriptorData = {
"\n\026MessageTypeProto.proto\022\032com.ljsd.jieli" +
"ng.protocols*i\n\013MessageType\022\027\n\022HEART_BEA" +
"T_REQUEST\020\350\007\022\030\n\023HEART_BEAT_RESPONSE\020\351\007\022\022" +
"\n\rLOGIN_REQUEST\020\220N\022\023\n\016LOGIN_RESPONSE\020\221NB" +
"\002H\001"
"ng.protocols*\217\004\n\013MessageType\022\027\n\022HEART_BE" +
"AT_REQUEST\020\350\007\022\030\n\023HEART_BEAT_RESPONSE\020\351\007\022" +
"\022\n\rLOGIN_REQUEST\020\220N\022\023\n\016LOGIN_RESPONSE\020\221N" +
"\022\033\n\026GET_PLAYERINFO_REQUEST\020\222N\022\034\n\027GET_PLA" +
"YERINFO_RESPONSE\020\223N\022\031\n\024GET_HEROINFO_REQU" +
"EST\020\224N\022\032\n\025GET_HEROINFO_RESPONSE\020\225N\022\031\n\024GE" +
"T_ITEMINFO_REQUEST\020\226N\022\032\n\025GET_ITEMINFO_RE" +
"SPONSE\020\227N\022\026\n\021ENTER_MAP_REQUEST\020\230N\022\027\n\022ENT" +
"ER_MAP_RESPONSE\020\231N\022\030\n\023START_FIGHT_REQUES",
"T\020\232N\022\031\n\024START_FIGHT_RESPONSE\020\233N\022\026\n\021END_F" +
"IGHT_REQUEST\020\234N\022\027\n\022END_FIGHT_RESPONSE\020\235N" +
"\022\032\n\025TRIGGER_EVENT_REQUEST\020\236N\022\033\n\026TRIGGER_" +
"EVENT_RESPONSE\020\237N\022\024\n\017OUT_MAP_REQUEST\020\240N\022" +
"\025\n\020OUT_MAP_RESPONSE\020\241NB\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {