v0.7.3까지 반영 #114

Closed
Hide_D wants to merge 310 commits from devel into master
2 changed files with 13 additions and 2 deletions
Showing only changes of commit 5e4493b49a - Show all commits
+12 -1
View File
@@ -72,7 +72,18 @@ function printGenerals(value){
$('#outdate_token').hide();
var time = Date.now() + value.pickMoreSeconds*1000;
$('#btn_pick_more').data('available', time).prop('disabled',true);
$.each(value.pick, function(idx, cardData){
var pick = $.map(value.pick, function(value, key) {
return value;
});
pick.sort(function(lhs, rhs){
var lsum = lhs.leader+lhs.power+lhs.intel;
var rsum = rhs.leader+rhs.power+rhs.intel;
return lsum - rsum;
});
$.each(pick, function(idx, cardData){
cardData.iconPath = getIconPath(cardData.imgsvr, cardData.picture);
var $card = $(TemplateEngine(templateGeneralCard, cardData));
+1 -1
View File
@@ -32,7 +32,7 @@ $nations = $db->queryAllLists('SELECT `name`, scoutmsg, color FROM nation');
<script type="text/javascript" src="../d_shared/common_path.js"></script>
<script type="text/javascript" src="../e_lib/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="../js/common.js?180505_2"></script>
<script src="js/select_npc.js?180505_3"></script>
<script src="js/select_npc.js?180505_4"></script>
</head>