Skip to content

Commit

Permalink
timeout description
Browse files Browse the repository at this point in the history 
manager icon + loca
manager tooltip color fix
  • Loading branch information
@fedorovvl
fedorovvl committed Oct 27, 2022
1 parent 814164b commit 48b8077
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions client/PostSubmitter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ private string PostData(string url,
}
catch(Exception ex)
{
result = " ERROR " + ex.Message;
if (Main.debug)
File.AppendAllText("debug.txt", url + ex.Message + ex.StackTrace + "\r\n");
}
Expand Down
2 changes: 1 addition & 1 deletion client/files/content/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<html> <head> <title>The Settlers Online</title> <script type="text/javascript" src="AIRAliases.js"></script><!-- AIR --> <link rel="stylesheet" href="bootstrap.min.css"> <script type="text/javascript" src="jquery.min.js"></script> <script type="application/x-shockwave-flash" src="library.swf"></script> <script type="text/javascript" src="bootstrap.min.js"></script> <script type="text/javascript" src="jquery-ui.min.js"></script> <style> .slider,div .name{cursor:pointer}.container-fluid{user-select:none}.container-fluid .ui-selected,.container-fluid .ui-selecting{background: #BBAF96;border-radius: 10px;}.row{margin-bottom:1px;}.modal-dialog{overflow-y:initial!important}.modal-body{height:68%;overflow-y:auto}.switch{position:relative;display:inline-block;width:36px;height:19px;top:2px}.switch input{display:none}.slider{position:absolute;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s}.slider:before{position:absolute;content:"";height:16px;width:16px;left:2px;top:1px;bottom:4px;background-color:#fff;-webkit-transition:.4s;transition:.4s}input:checked+.slider{background-color:#2196f3}input:focus+.slider{box-shadow:0 0 1px #2196f3}input:checked+.slider:before{-webkit-transform:translateX(16px);-ms-transform:translateX(16px);transform:translateX(16px)}.slider.round,.slider.round:before{border-radius:16px}[data-tooltip]{position:relative}[data-tooltip]::after{content:attr(data-tooltip);position:absolute;top:-20px;right:-20px;width:200px;pointer-events:none;opacity:0;display:block;font-size:12px;line-height:16px;background:#fefdcd;padding:2px;border:1px solid silver;box-shadow:2px 4px 5px rgba(0,0,0,.4);z-index:1000}[data-tooltip]:hover::after{opacity:1}*::-webkit-scrollbar {width: 6px;}.modal-header{background: url('images/window_top.png') no-repeat, url('images/window_middle.png') repeat; background-size: contain;border-bottom: 0px;}.modal-body{background: url('images/window_middle.png'); background-size: contain;}.modal-footer{background: url(images/window_bottom.png) no-repeat;background-size: contain;border-top: 0px;}.modal{color: wheat;}.modal select {color: black;}.btn { border-color: transparent !important;background: url('images/btn_normal_left.png') no-repeat left, url('images/btn_normal_right.png') no-repeat right,url('images/btn_normal_middle.png') repeat center; }.btn:hover { background: url('images/btn_hover_left.png') no-repeat left, url('images/btn_hover_right.png') no-repeat right,url('images/btn_hover_middle.png') repeat center; }.btn.disabled, .btn:disabled { background: url('images/btn_disabled_left.png') no-repeat left, url('images/btn_disabled_right.png') no-repeat right,url('images/btn_disabled_middle.png') repeat center;}.tblHeader{background-color:#B2A589;height:23px;color:#000;}.buffNotReady{background-color:#FFC1BF;color:#000;border-radius:5px;}.buffReady{background-color:#CEFF9B;color:#000;border-radius:5px;} </style> <script type="text/javascript"> var swmmo; var loca; var assets; var b64encoder; var loadInterval; var keyboardKeys = {}; var userKeyboardKeys = {}; var isDebug = false; window.onload=appLoad; function appLoad(){ window.nativeWindow.menu = new air.NativeMenu(); var loader = new air.Loader(); loader.contentLoaderInfo.addEventListener(air.Event.COMPLETE, loadCompleteHandler) loader.load(new air.URLRequest("client.swf")); window.nativeWindow.stage.getChildAt(0).paintsDefaultBackground=false; } function loadCompleteHandler(event) { swmmo = event.target.content; window.nativeWindow.stage.addChild( swmmo ); window.nativeWindow.stage.addEventListener(air.Event.RESIZE, function(event) { swmmo.setActualSize(window.nativeWindow.stage.stageWidth, window.nativeWindow.stage.stageHeight); }); window.nativeWindow.addEventListener("displayStateChange", function(event) { swmmo.setActualSize(window.nativeWindow.stage.stageWidth, window.nativeWindow.stage.stageHeight); }); window.nativeWindow.stage.addEventListener(window.runtime.flash.events.KeyboardEvent.KEY_DOWN, function(event) { keyComb = event.keyCode.toString() + event.ctrlKey.toString(); if(keyboardKeys[keyComb]) { keyboardKeys[keyComb].fn(null); } if(userKeyboardKeys[keyComb]) { userKeyboardKeys[keyComb].fn(null); } }); air.NativeApplication.nativeApplication.addEventListener("invoke", function(event) { var p={}; event.arguments[0].replace(/[?&]+([^=&]+)=([^&]*)/gi, function(s,k,v){p[k]=v}) if(p["window"] && p["window"] == "fullscreen") { window.nativeWindow.stage.displayState = "fullScreenInteractive"; } if(p["window"] && p["window"] == "maximized") { window.nativeWindow.maximize(); } if(p["debug"]) { isDebug = true; } }); loadInterval = setInterval(function(){ if(!swmmo.getDefinitionByName("globalFlash").gui.GetDefaultGuiElementsLoaded()) { return; } loca = swmmo.getDefinitionByName("GUI.Loca::cLocaManager").GetInstance(); assets = swmmo.getDefinitionByName("GUI.Assets::gAssetManager"); var b64def = swmmo.getDefinitionByName("mx.utils::Base64Encoder"); b64encoder = new b64def(); b64encoder.insertNewLines = false; document.title += ' - ' + swmmo.application.mGameInterface.mHomePlayer.GetPlayerName_string(); clearInterval(loadInterval); air.File.applicationDirectory.resolvePath("scripts").getDirectoryListing().forEach(function(item) { $('head').append($("<script>").attr({ "src": "scripts/" + item.name, "type": "text/javascript"})); }); setTimeout(function() { reloadScripts(null); }, 1000); }, 2000); } </script></head> <body style="background-color:transparent;"> <div class="container"> <div class="alert alert-success" style="display:none;"> <strong>Success!</strong> <span id="successalertMessage"></span> </div> <div class="alert alert-warning" style="display:none;"> <strong>Warning!</strong> <span id="warningalertMessage"></span> </div> <div class="alert alert-danger" style="display:none;"> <strong>Error!</strong> <span id="dangeralertMessage"></span> </div> <!-- Modal --> <div class="modal fade" id="specModal" role="dialog"> <div class="modal-dialog modal-lg"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">Specialists manager</h4><br> <div class="container-fluid"> <div class="row"> <div class="col-xs-4 col-sm-4 col-lg-4 tblHeader" style="border-radius:10px 0px 0px 10px;">Name</div> <div class="col-xs-3 col-sm-3 col-lg-3 tblHeader"> <label class="switch"> <input type="checkbox" id="specTimeType"> <span class="slider round"></span> </label> <div style="position: absolute;left: 55px;top: 1px;">Normal/Arrival</div> </div> <div class="col-xs-5 col-sm-5 col-lg-5 massSend tblHeader" style="border-radius:0px 10px 10px 0px;"></div> </div> </div> </div> <div id="specModalData" class="modal-body"> </div> <div class="modal-footer"> <button type="button" class="btn btn-primary pull-left" onclick="saveSpecTemplate()">Save as template</button> <button type="button" class="btn btn-primary pull-left" onclick="loadSpecTemplate()">Load template</button> <button type="button" class="btn btn-success" onclick="sendSpec()">Submit</button> <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> </div> </div> </div> </div> <div class="modal fade" id="buffModal" role="dialog"> <div class="modal-dialog modal-lg"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">Buff manager</h4> </div> <div id="buffModalData" class="modal-body"> </div> <div class="modal-footer"> <button type="button" class="btn btn-primary pull-left" id="buffSaveTemplate" onclick="buffSaveTemplate()">Save as template</button> <button type="button" class="btn btn-primary pull-left" onclick="buffLoadTemplate()">Load template</button> <button type="button" class="btn btn-warning" id="buffReset" onclick="buffResetData()">Reset</button> <button type="button" class="btn btn-success" id="buffSubmit" onclick="buffDoJob()">Submit</button> <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> </div> </div> </div> </div> <div class="modal fade" id="aucModal" role="dialog"> <div class="modal-dialog modal-lg"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">Auction manager</h4> </div> <div id="aucModalData" class="modal-body"> </div> <div class="modal-footer"> <button type="button" class="btn btn-primary pull-left" id="aucReloadData" onclick="aucReloadData()">Reload</button> <button type="button" class="btn btn-success" id="auxPlaceBet" onclick="auxPlaceBet()">Place bet</button> <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> </div> </div> </div> </div> <div class="modal fade" id="managerModal" role="dialog"> <div class="modal-dialog modal-lg"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">Script manager</h4> </div> <div id="managerModalData" class="modal-body"> </div> <div class="modal-footer"> <button type="button" class="btn btn-primary" id="managerReinstall" onclick="managerReinstall()">Fix mismatch</button> <button type="button" class="btn btn-success" id="managerProceed" onclick="managerProceed()">Submit</button> <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> </div> </div> </div> </div> </div></body> </html>
<html> <head> <title>The Settlers Online</title> <script type="text/javascript" src="AIRAliases.js"></script><!-- AIR --> <link rel="stylesheet" href="bootstrap.min.css"> <script type="text/javascript" src="jquery.min.js"></script> <script type="application/x-shockwave-flash" src="library.swf"></script> <script type="text/javascript" src="bootstrap.min.js"></script> <script type="text/javascript" src="jquery-ui.min.js"></script> <style> .slider,div .name{cursor:pointer}.container-fluid{user-select:none}.container-fluid .ui-selected,.container-fluid .ui-selecting{background: #BBAF96;border-radius: 10px;}.row{margin-bottom:1px;}.modal-dialog{overflow-y:initial!important}.modal-body{height:68%;overflow-y:auto}.switch{position:relative;display:inline-block;width:36px;height:19px;top:2px}.switch input{display:none}.slider{position:absolute;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s}.slider:before{position:absolute;content:"";height:16px;width:16px;left:2px;top:1px;bottom:4px;background-color:#fff;-webkit-transition:.4s;transition:.4s}input:checked+.slider{background-color:#2196f3}input:focus+.slider{box-shadow:0 0 1px #2196f3}input:checked+.slider:before{-webkit-transform:translateX(16px);-ms-transform:translateX(16px);transform:translateX(16px)}.slider.round,.slider.round:before{border-radius:16px}[data-tooltip]{position:relative}[data-tooltip]::after{content:attr(data-tooltip);position:absolute;top:-20px;right:-20px;width:200px;pointer-events:none;opacity:0;display:block;font-size:12px;line-height:16px;color:#000;background:#fefdcd;padding:2px;border:1px solid silver;box-shadow:2px 4px 5px rgba(0,0,0,.4);z-index:1000}[data-tooltip]:hover::after{opacity:1}*::-webkit-scrollbar {width: 6px;}.modal-header{background: url('images/window_top.png') no-repeat, url('images/window_middle.png') repeat; background-size: contain;border-bottom: 0px;}.modal-body{background: url('images/window_middle.png'); background-size: contain;}.modal-footer{background: url(images/window_bottom.png) no-repeat;background-size: contain;border-top: 0px;}.modal{color: wheat;}.modal select {color: black;}.btn { border-color: transparent !important;background: url('images/btn_normal_left.png') no-repeat left, url('images/btn_normal_right.png') no-repeat right,url('images/btn_normal_middle.png') repeat center; }.btn:hover { background: url('images/btn_hover_left.png') no-repeat left, url('images/btn_hover_right.png') no-repeat right,url('images/btn_hover_middle.png') repeat center; }.btn.disabled, .btn:disabled { background: url('images/btn_disabled_left.png') no-repeat left, url('images/btn_disabled_right.png') no-repeat right,url('images/btn_disabled_middle.png') repeat center;}.tblHeader{background-color:#B2A589;height:23px;color:#000;}.buffNotReady{background-color:#FFC1BF;color:#000;border-radius:5px;}.buffReady{background-color:#CEFF9B;color:#000;border-radius:5px;} </style> <script type="text/javascript"> var swmmo; var loca; var assets; var b64encoder; var loadInterval; var keyboardKeys = {}; var userKeyboardKeys = {}; var isDebug = false; window.onload=appLoad; function appLoad(){ window.nativeWindow.menu = new air.NativeMenu(); var loader = new air.Loader(); loader.contentLoaderInfo.addEventListener(air.Event.COMPLETE, loadCompleteHandler) loader.load(new air.URLRequest("client.swf")); window.nativeWindow.stage.getChildAt(0).paintsDefaultBackground=false; } function loadCompleteHandler(event) { swmmo = event.target.content; window.nativeWindow.stage.addChild( swmmo ); window.nativeWindow.stage.addEventListener(air.Event.RESIZE, function(event) { swmmo.setActualSize(window.nativeWindow.stage.stageWidth, window.nativeWindow.stage.stageHeight); }); window.nativeWindow.addEventListener("displayStateChange", function(event) { swmmo.setActualSize(window.nativeWindow.stage.stageWidth, window.nativeWindow.stage.stageHeight); }); window.nativeWindow.stage.addEventListener(window.runtime.flash.events.KeyboardEvent.KEY_DOWN, function(event) { keyComb = event.keyCode.toString() + event.ctrlKey.toString(); if(keyboardKeys[keyComb]) { keyboardKeys[keyComb].fn(null); } if(userKeyboardKeys[keyComb]) { userKeyboardKeys[keyComb].fn(null); } }); air.NativeApplication.nativeApplication.addEventListener("invoke", function(event) { var p={}; event.arguments[0].replace(/[?&]+([^=&]+)=([^&]*)/gi, function(s,k,v){p[k]=v}) if(p["window"] && p["window"] == "fullscreen") { window.nativeWindow.stage.displayState = "fullScreenInteractive"; } if(p["window"] && p["window"] == "maximized") { window.nativeWindow.maximize(); } if(p["debug"]) { isDebug = true; } }); loadInterval = setInterval(function(){ if(!swmmo.getDefinitionByName("globalFlash").gui.GetDefaultGuiElementsLoaded()) { return; } loca = swmmo.getDefinitionByName("GUI.Loca::cLocaManager").GetInstance(); assets = swmmo.getDefinitionByName("GUI.Assets::gAssetManager"); var b64def = swmmo.getDefinitionByName("mx.utils::Base64Encoder"); b64encoder = new b64def(); b64encoder.insertNewLines = false; document.title += ' - ' + swmmo.application.mGameInterface.mHomePlayer.GetPlayerName_string(); clearInterval(loadInterval); air.File.applicationDirectory.resolvePath("scripts").getDirectoryListing().forEach(function(item) { $('head').append($("<script>").attr({ "src": "scripts/" + item.name, "type": "text/javascript"})); }); setTimeout(function() { reloadScripts(null); }, 1000); }, 2000); } </script></head> <body style="background-color:transparent;"> <div class="container"> <div class="alert alert-success" style="display:none;"> <strong>Success!</strong> <span id="successalertMessage"></span> </div> <div class="alert alert-warning" style="display:none;"> <strong>Warning!</strong> <span id="warningalertMessage"></span> </div> <div class="alert alert-danger" style="display:none;"> <strong>Error!</strong> <span id="dangeralertMessage"></span> </div> <!-- Modal --> <div class="modal fade" id="specModal" role="dialog"> <div class="modal-dialog modal-lg"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">Specialists manager</h4><br> <div class="container-fluid"> <div class="row"> <div class="col-xs-4 col-sm-4 col-lg-4 tblHeader" style="border-radius:10px 0px 0px 10px;">Name</div> <div class="col-xs-3 col-sm-3 col-lg-3 tblHeader"> <label class="switch"> <input type="checkbox" id="specTimeType"> <span class="slider round"></span> </label> <div style="position: absolute;left: 55px;top: 1px;">Normal/Arrival</div> </div> <div class="col-xs-5 col-sm-5 col-lg-5 massSend tblHeader" style="border-radius:0px 10px 10px 0px;"></div> </div> </div> </div> <div id="specModalData" class="modal-body"> </div> <div class="modal-footer"> <button type="button" class="btn btn-primary pull-left" onclick="saveSpecTemplate()">Save as template</button> <button type="button" class="btn btn-primary pull-left" onclick="loadSpecTemplate()">Load template</button> <button type="button" class="btn btn-success" onclick="sendSpec()">Submit</button> <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> </div> </div> </div> </div> <div class="modal fade" id="buffModal" role="dialog"> <div class="modal-dialog modal-lg"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">Buff manager</h4> </div> <div id="buffModalData" class="modal-body"> </div> <div class="modal-footer"> <button type="button" class="btn btn-primary pull-left" id="buffSaveTemplate" onclick="buffSaveTemplate()">Save as template</button> <button type="button" class="btn btn-primary pull-left" onclick="buffLoadTemplate()">Load template</button> <button type="button" class="btn btn-warning" id="buffReset" onclick="buffResetData()">Reset</button> <button type="button" class="btn btn-success" id="buffSubmit" onclick="buffDoJob()">Submit</button> <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> </div> </div> </div> </div> <div class="modal fade" id="aucModal" role="dialog"> <div class="modal-dialog modal-lg"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">Auction manager</h4> </div> <div id="aucModalData" class="modal-body"> </div> <div class="modal-footer"> <button type="button" class="btn btn-primary pull-left" id="aucReloadData" onclick="aucReloadData()">Reload</button> <button type="button" class="btn btn-success" id="auxPlaceBet" onclick="auxPlaceBet()">Place bet</button> <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> </div> </div> </div> </div> <div class="modal fade" id="managerModal" role="dialog"> <div class="modal-dialog modal-lg"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">Script manager</h4> </div> <div id="managerModalData" class="modal-body"> </div> <div class="modal-footer"> <button type="button" class="btn btn-primary" id="managerReinstall" onclick="managerReinstall()">Fix mismatch</button> <button type="button" class="btn btn-success" id="managerProceed" onclick="managerProceed()">Submit</button> <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> </div> </div> </div> </div> </div></body> </html>
Expand Down
1 change: 1 addition & 0 deletions client/files/content/scripts/0-manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ $("#managerModal").on('show.bs.modal hide.bs.modal', function(){ window.nativeWi
function scriptsManagerWindow()
{
$( "div[role='dialog']:not(#managerModal):visible").modal("hide");
$('#managerModal .modal-title').html(getImageTag('BattleBuffKill_random_unit_type_limited') + ' ' + loca.GetText("LAB", 'EventProgression'));
$('#managerProceed').attr("disabled", true);
$('#managerReinstall').attr("disabled", true);
currentScripts = getCurrentScripts();
Expand Down
Loading

0 comments on commit 48b8077

Please sign in to comment.