From e812f2c6ddfc926e78962d0d17ba60212b8ad431 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Wed, 9 Dec 2020 17:32:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/ace.min.css |  3 +++
 config.json            |  2 +-
 pmcalendar.php         | 20 +++++++++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/assets/css/ace.min.css b/assets/css/ace.min.css
index e0309e7..eaec906 100644
--- a/assets/css/ace.min.css
+++ b/assets/css/ace.min.css
@@ -14918,6 +14918,9 @@ th[aria-selected='true'] .ui-jqgrid-sortable {
     .fc-state-disabled {
         /* display: none !important; */
     }
+    #chart {
+        margin-top: 190px !important;
+    }
 }
 
 .jqstooltip,
diff --git a/config.json b/config.json
index c9f45a8..aed937b 100644
--- a/config.json
+++ b/config.json
@@ -1 +1 @@
-{"games":["\u5b64\u5c9b\u5947\u5175","\u90e8\u843d\u6218\u9b42","\u90e8\u843d\u7e41\u4f53\u7248","\u90e8\u843d\u97e9\u6587\u7248","\u90e8\u843d\u8d8a\u5357\u7248","\u90e8\u843d\u82f1\u6587\u7248","\u90e8\u843d\u6cf0\u6587\u7248","\u90e8\u843dH5\u7248","\u66d9\u5149\u4e4b\u5883","\u9b54\u6cd5\u95e8H5","\u6b63\u7248\u9b54\u6cd5\u95e8\u539f\u751f","3D\u963f\u51e1\u8fbe","\u5927\u6218\u56fd","\u5927\u4e09\u56fd","\u5927\u4e09\u56fd\u97e9\u6587","\u5766\u514b\u7a81\u88ad","\u5251\u5723\u6302\u673a","\u7cbe\u7075\u7eaa\u5143","\u9b54\u6cd5\u65e0\u654c","\u4e50\u8c37\u519b\u5e08","X\u7cbe\u7075","\u5730\u4ea7\u5927\u4ea8","\u4e50\u8c37MT","\u8d85\u7ea7\u6536\u85cf\u5bb6","\u4e71\u4e16\u957f\u6b4c","\u6b4c\u624b2019","\u6b4c\u624bCOCOS","\u8bd9\u8c10\u4e09\u56fd","\u751f\u5316\u7eaa\u5143","\u6218\u56fd\u4e89\u9e23","\u6697\u9ed1\u5730\u4e0b\u57ce\u7e41\u4f53","\u5996\u7075\u6218\u59ec","\u5c71\u6d77\u7ecf","3D\u751f\u5316","\u98ce\u66b4\u5947\u5175","\u4e2d\u53e4\u6218\u9524","\u50cf\u7d20\u9879\u76ee","\u5176\u4ed6"],"roles":["\u8212\u5c55","\u9093\u5b9a\u658c"],"gxvroles":["\u7f57\u677e\u67cf"],"gxyyeroles":["\u9b4f\u6676"],"gxcperoles":[""],"gxyferoles":["\u5434\u660a"],"xfvroles":[""],"xfyyeroles":["\u5434\u660a"]}
\ No newline at end of file
+{"games":["\u5b64\u5c9b\u5947\u5175","\u90e8\u843d\u6218\u9b42","\u90e8\u843d\u7e41\u4f53\u7248","\u90e8\u843d\u97e9\u6587\u7248","\u90e8\u843d\u8d8a\u5357\u7248","\u90e8\u843d\u82f1\u6587\u7248","\u90e8\u843d\u6cf0\u6587\u7248","\u90e8\u843dH5\u7248","\u66d9\u5149\u4e4b\u5883","\u9b54\u6cd5\u95e8H5","\u6b63\u7248\u9b54\u6cd5\u95e8\u539f\u751f","3D\u963f\u51e1\u8fbe","\u5927\u6218\u56fd","\u5927\u4e09\u56fd","\u5927\u4e09\u56fd\u97e9\u6587","\u5766\u514b\u7a81\u88ad","\u5251\u5723\u6302\u673a","\u7cbe\u7075\u7eaa\u5143","\u9b54\u6cd5\u65e0\u654c","\u4e50\u8c37\u519b\u5e08","X\u7cbe\u7075","\u5730\u4ea7\u5927\u4ea8","\u4e50\u8c37MT","\u8d85\u7ea7\u6536\u85cf\u5bb6","\u4e71\u4e16\u957f\u6b4c","\u6b4c\u624b2019","\u6b4c\u624bCOCOS","\u8bd9\u8c10\u4e09\u56fd","\u751f\u5316\u7eaa\u5143","\u6218\u56fd\u4e89\u9e23","\u6697\u9ed1\u5730\u4e0b\u57ce\u7e41\u4f53","\u5996\u7075\u6218\u59ec","\u5c71\u6d77\u7ecf","3D\u751f\u5316","\u98ce\u66b4\u5947\u5175","\u4e2d\u53e4\u6218\u9524","\u50cf\u7d20\u9879\u76ee","\u5176\u4ed6"],"roles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u7f57\u677e\u67cf"],"gxvroles":["\u7f57\u677e\u67cf"],"gxyyeroles":["\u9b4f\u6676","\u7f57\u677e\u67cf"],"gxcperoles":[""],"gxyferoles":["\u5434\u660a"],"xfvroles":[""],"xfyyeroles":["\u5434\u660a"]}
\ No newline at end of file
diff --git a/pmcalendar.php b/pmcalendar.php
index a9b7dc0..b0cc72c 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -306,7 +306,7 @@ if ($act == 'newevent') {
                 <div id="gamesbtn" style="padding:0 11px 15px 11px;">
                     <!-- 筛选： -->
                     <?php if ($canEdit) { ?><a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a><? } ?>
-<!--                     <a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a>-->
+                    <!-- <a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a> -->
                     <button value='' onclick='onlyShowGame(this)' class='btn btn-minier btn-info'>显示全部</button>
                     <?php
                     foreach ($GAMES as $g) {
@@ -1401,7 +1401,11 @@ if ($act == 'newevent') {
                         }
                         ;
                     } else {
-                        return
+                        if ("<?=$canEdit?>" == "1") {
+                            Info()
+                        }else {
+                            return
+                        }
                     }
             }
 
@@ -1461,6 +1465,7 @@ if ($act == 'newevent') {
                         },
                         legend: {
                             left: '3%',
+                            top: '20',
                             itemHeight: 11,
                             itemWidth: 6,
                             color:"#5f5f5f"
@@ -1678,7 +1683,16 @@ if ($act == 'newevent') {
     }
 
     $("#yiny").click(function () {
-        location.reload();
+        // location.reload();
+        var showGame = "";
+        starttime, endtime;
+        dstr = ''
+        dict = {};
+        bumen;
+        notid;
+        arrcp = [];
+        arryy = [];
+        arryf = [];
         $("#popup-bg").hide();
         $('body,html').css('overflow', 'auto')
     })