0717
parent
e60f6e465d
commit
fb2fdac03e
|
|
@ -5,30 +5,16 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="20e8fee9-fdf8-4f0a-b077-01dc794cf1f5" name="Changes" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/extend/zp/uitl/WinCardPxNew.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/compiler.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/encodings.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/misc.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../game_common/target/game_common-1.0.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../game_common/target/game_common-1.0.0.jar" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/game-config.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/game-config.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/taurus-core.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/taurus-core.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/extend/zp/EXRoom.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/extend/zp/EXRoom.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/extend/zp/PlayerRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/extend/zp/PlayerRuleManager.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/logs/game.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/game.log" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/extend/zp/RoomCard.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/extend/zp/RoomCard.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/extend/zp/player/rule/RuleDealTi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/extend/zp/player/rule/RuleDealTi.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/extend/zp/player/rule/RuleDrawWin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/extend/zp/player/rule/RuleDrawWin.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/extend/zp/player/state/EXPlayerDrawState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/extend/zp/player/state/EXPlayerDrawState.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/extend/zp/uitl/Paixing.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/extend/zp/uitl/Paixing.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/extend/zp/uitl/WinCardNew.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/extend/zp/uitl/WinCardNew.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/extend/zp/RoomCard.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/extend/zp/RoomCard.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_group/target/ROOT.war" beforeDir="false" afterPath="$PROJECT_DIR$/../web_group/target/ROOT.war" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupLogService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupLogService.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupRoomService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupRoomService.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_group/target/classes/com/group/service/GroupLogService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../web_group/target/classes/com/group/service/GroupLogService.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_group/target/classes/com/group/service/GroupRoomService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../web_group/target/classes/com/group/service/GroupRoomService.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_group/target/classes/com/group/service/GroupService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../web_group/target/classes/com/group/service/GroupService.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_login/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web_group/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../web_group/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -56,24 +42,24 @@
|
|||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"Application.Main.executor": "Run",
|
||||
"Maven.game_zp_fangpaofa [clean].executor": "Run",
|
||||
"Maven.game_zp_fangpaofa [install].executor": "Run",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"git-widget-placeholder": "master",
|
||||
"kotlin-language-version-configured": "true",
|
||||
"last_opened_file_path": "D:/cuican/server/game_zp_fangpaofa/config",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "MavenSettings",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"Application.Main.executor": "Debug",
|
||||
"Maven.game_zp_fangpaofa [clean].executor": "Run",
|
||||
"Maven.game_zp_fangpaofa [install].executor": "Run",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"git-widget-placeholder": "master",
|
||||
"kotlin-language-version-configured": "true",
|
||||
"last_opened_file_path": "D:/cuican/server/game_zp_fangpaofa/config",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "MavenSettings",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}</component>
|
||||
}]]></component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="D:\cuican\server\game_zp_fangpaofa\config" />
|
||||
|
|
@ -135,7 +121,7 @@
|
|||
<workItem from="1784133369894" duration="1994000" />
|
||||
<workItem from="1784139699325" duration="7296000" />
|
||||
<workItem from="1784185636966" duration="875000" />
|
||||
<workItem from="1784188543231" duration="1009000" />
|
||||
<workItem from="1784188543231" duration="1380000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -24,11 +24,11 @@ public class RoomCard {
|
|||
this.cardList.clear();
|
||||
this.subCardList.clear();
|
||||
//this.sanlong();
|
||||
|
||||
this.initCard();
|
||||
this.testpai();
|
||||
/*this.initCard();
|
||||
this.shuffle();
|
||||
this.subCard(); //抽牌
|
||||
|
||||
*/
|
||||
//this.shuffle();
|
||||
|
||||
//this.testhuxi();
|
||||
|
|
@ -78,9 +78,9 @@ public class RoomCard {
|
|||
}
|
||||
|
||||
public void sanlong(){
|
||||
List list = Arrays.asList(101, 102, 103, 103, 104, 104, 105, 106, 109, 109, 202, 203, 204, 204, 206, 208, 209, 210, 210, 210);
|
||||
List list2 = Arrays.asList(101, 102, 103, 104, 106, 106, 107, 107, 108, 108, 110, 201, 202, 203, 204, 205, 205, 205, 208, 209);
|
||||
List list3 = Arrays.asList(109, 206, 203, 103, 102, 105, 201, 201, 110, 202, 206, 104, 209, 109, 207, 101, 210, 101, 107, 208);
|
||||
List list = Arrays.asList(101, 101, 101, 102, 103, 103, 103, 108, 108, 110, 201, 203, 203, 203, 204, 208, 209, 209, 210, 210);
|
||||
List list2 = Arrays.asList(102, 102, 104, 105, 106, 106, 107, 107, 108, 109, 110, 201, 205, 205, 207, 207, 208, 209, 209, 210);
|
||||
List list3 = Arrays.asList(202, 205, 105, 205, 109, 107, 206, 110, 107, 204, 206, 104, 104, 106, 204, 109, 202, 201, 101, 108);
|
||||
this.cardList.addAll(list);
|
||||
this.cardList.addAll(list2);
|
||||
this.cardList.addAll(list3);
|
||||
|
|
@ -88,9 +88,9 @@ public class RoomCard {
|
|||
|
||||
|
||||
public void testpai(){
|
||||
List list = Arrays.asList(101, 103, 103, 103, 105, 105, 106, 107, 108, 110, 110, 202, 203, 204, 205, 205, 207, 208, 208, 209);
|
||||
List list2 = Arrays.asList(101, 101, 104, 104, 105, 105, 106, 108, 108, 109, 109, 110, 201, 202, 203, 206, 208, 208, 209, 210);
|
||||
List list3 = Arrays.asList(207, 106, 203, 201, 109, 104, 110, 102, 210, 103, 204, 107, 206, 202, 210, 104, 210, 206, 201, 206);
|
||||
List list = Arrays.asList(101, 104, 104, 105, 107, 107, 107, 108, 109, 201, 202, 206, 206, 207, 208, 208, 209, 210, 210, 210);
|
||||
List list2 = Arrays.asList(101, 101, 103, 104, 106, 107, 108, 108, 109, 202, 202, 202, 203, 203, 206, 207, 207, 209, 209, 210);
|
||||
List list3 = Arrays.asList(101, 205, 103, 205, 207, 106, 102, 109, 203, 201, 103, 206, 205, 205, 104, 110, 108, 102, 105, 204);
|
||||
|
||||
this.cardList.addAll(list);
|
||||
this.cardList.addAll(list2);
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,12 +1,12 @@
|
|||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\controller\GroupController.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\controller\GroupLogController.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\controller\GroupRoomController.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\job\UpdatePlayRoomJob.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\MainServer.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\Protocol.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\service\GroupLogService.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\service\GroupPublisherService.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\service\GroupRoomService.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\service\GroupService.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\service\RSAUtils.java
|
||||
D:\project\changhong\changhongserver\web_group\src\main\java\com\group\WebInterceptor.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\WebInterceptor.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\service\GroupService.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\service\RSAUtils.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\service\GroupLogService.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\service\GroupRoomService.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\job\UpdatePlayRoomJob.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\Protocol.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\MainServer.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\service\GroupPublisherService.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\controller\GroupLogController.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\controller\GroupController.java
|
||||
D:\cuican\server\web_group\src\main\java\com\group\controller\GroupRoomController.java
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
D:\project\changhong\changhongserver\web_group\src\test\java\web_group\DataClearUtils.java
|
||||
D:\project\changhong\changhongserver\web_group\src\test\java\web_group\Main.java
|
||||
D:\cuican\server\web_group\src\test\java\web_group\DataClearUtils.java
|
||||
D:\cuican\server\web_group\src\test\java\web_group\Main.java
|
||||
|
|
|
|||
Loading…
Reference in New Issue