Bladeren bron

fixed: 发送补偿邮件接口操作userinfo(此时为空). mod: 公告页面简化

王刚 3 jaren geleden
bovenliggende
commit
4ee052be7a

+ 15 - 13
Gameserver/Amfphp/process/EventProc/CornerSignEventProc.php

@@ -58,78 +58,80 @@ class CornerSignEventProc {
     }
 
     /**
-     * 言灵召唤状态,解锁新的法师 
+     * 言灵召唤状态,解锁新的法师
      */
     public static function OnCall_Magician_new() {
         req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Call_Magician;
     }
 
     /**
-     * 言灵召唤状态,解锁新的射手 
+     * 言灵召唤状态,解锁新的射手
      */
     public static function OnCall_Archer_new() {
         req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Call_Archer;
     }
 
     /**
-     * 包裹--获得新的武器 
+     * 包裹--获得新的武器
      */
     public static function OnBag_new_Weapon() {
         req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Bag_Weapon;
     }
 
     /**
-     * 包裹--获得新的言灵 
+     * 包裹--获得新的言灵
      */
     public static function OnBag_new_Yanling() {
         req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Bag_Kotodama;
     }
 
     /**
-     * 包裹--获得新的碎片 
+     * 包裹--获得新的碎片
      */
     public static function OnBag_new_Fragment() {
         req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Bag_Fragment;
     }
 
     /**
-     * 包裹--获得新的材料 
+     * 包裹--获得新的材料
      */
     public static function OnBag_new_Material() {
         req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Bag_Material;
     }
 
     /**
-     * 排行榜--战力奖励状态有变化 
+     * 排行榜--战力奖励状态有变化
      */
     public static function OnRanking_PowerReward_new() {
         req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Ranking_PowerReward;
     }
 
     /**
-     * 排行榜--通关奖励状态有变化 
+     * 排行榜--通关奖励状态有变化
      */
     public static function OnRanking_GageReward_new() {
         req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Ranking_ClearanceReward;
     }
 
     /**
-     * 邮件系统--有新的邮件 
+     * 邮件系统--有新的邮件
      */
     public static function OnNewMails() {
-        req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Mail_New;
-        UserProc::updateUserInfo();
+        if (isset(req()->userInfo)) {
+            req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Mail_New;
+            UserProc::updateUserInfo();
+        }
     }
 
     /**
-     * 公告有更新 
+     * 公告有更新
      */
     public static function OnNotice_new() {
         req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Notice_New;
     }
 
     /**
-     * AAA 
+     * AAA
      */
     public static function OnAAA() {
         req()->userInfo->game->privateState->cornerSignNotifications[] = OperateEventType::Arena_FreeTimes;

+ 7 - 115
Gameserver/Public/app_files/basic.css

@@ -11,7 +11,7 @@ body {
 	max-width: 960px;
 	min-width: 320px;
 	min-height: 100%;
-	
+	font-size: 62.5%;
 }
 
 html {
@@ -95,8 +95,7 @@ svg:not(:root) {
 	overflow: hidden
 }
 
-code,
-kbd,
+code, 
 pre,
 samp {
 	font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
@@ -541,25 +540,7 @@ dl.row>dd+dt {
 	color: #ccd5db
 }
 
-kbd {
-	font-size: 90%;
-	padding: .15rem .3rem;
-	color: #fff;
-	border-radius: .143rem;
-	background-color: #62a8ea;
-	-webkit-box-shadow: inset 0 -.1rem 0 rgba(0, 0, 0, .25);
-	box-shadow: inset 0 -.1rem 0 rgba(0, 0, 0, .25);
-	border: 1px solid #bcd8f1
-}
-
-kbd kbd {
-	font-size: 100%;
-	font-weight: 700;
-	padding: 0;
-	-webkit-box-shadow: none;
-	box-shadow: none
-}
-
+ 
 pre {
 	white-space: normal;
 	font-size: 90%;
@@ -1302,87 +1283,7 @@ pre code {
 		margin-left: 91.666667%
 	}
 }
-
-.table {
-	max-width: 100%;
-	margin-bottom: 1rem;
-	color: #76838f
-}
-
-.table td,
-.table th {
-	padding: .572rem;
-	vertical-align: top;
-	border-top: 1px solid #e4eaec
-}
-
-.table thead th {
-	vertical-align: bottom;
-	border-bottom: 2px solid #e4eaec
-}
-
-.table tbody+tbody {
-	border-top: 2px solid #e4eaec
-}
-
-.table .table {
-	background-color: #fff
-}
-
-.table-sm td,
-.table-sm th {
-	padding: .358rem
-}
-
-.table-bordered {
-	border: 1px solid #e4eaec
-}
-
-.table-bordered td,
-.table-bordered th {
-	border: 1px solid #ddd
-}
-
-.table-bordered thead td,
-.table-bordered thead th {
-	border-bottom-width: 1px
-}
-
-.table-striped tbody tr:nth-of-type(odd) {
-	background-color: rgba(243, 247, 249, .3)
-}
-
-.table-hover tbody tr:hover {
-	background-color: #f3f7f9
-}
-
-.table-active,
-.table-active>td,
-.table-active>th {
-	background-color: #f3f7f9
-}
-
-.table-active a {
-	color: inherit
-}
-
-.table-hover .table-active:hover {
-	background-color: #e2ecf1
-}
-
-.table-hover .table-active:hover>td,
-.table-hover .table-active:hover>th {
-	color: inherit;
-	background-color: #e2ecf1
-}
-
-.table-responsive {
-	display: block;
-	overflow-x: auto;
-	width: 100%;
-	min-height: .01%
-}
-
+ 
 .form-control {
 	font-size: 1rem;
 	line-height: 1.571429;
@@ -1545,10 +1446,7 @@ html:not(.met-web) .has-success .input-group-addon {
 	background-color: #ddf3e9
 }
 
-html:not(.met-web) .has-success .form-control-success {
-	background-image: url('data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 8 8\'%3E%3Cpath fill=\'$form-icon-success-color\' d=\'M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z\'/%3E%3C/svg%3E')
-}
-
+ 
 .has-warning .custom-control,
 .has-warning .form-control-label {
 	color: #f2a654
@@ -1566,10 +1464,7 @@ html:not(.met-web) .has-success .form-control-success {
 	background-color: #fff
 }
 
-.has-warning .form-control-warning {
-	background-image: url('data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 8 8\'%3E%3Cpath fill=\'#f2a654\' d=\'M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z\'/%3E%3C/svg%3E')
-}
-
+ 
 .has-danger .custom-control,
 .has-danger .form-control-label {
 	color: #f96868
@@ -1586,10 +1481,7 @@ html:not(.met-web) .has-success .form-control-success {
 	border-color: #f96868;
 	background-color: #fff
 }
-
-.has-danger .form-control-danger {
-	background-image: url('data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' fill=\'#f96868\' viewBox=\'-2 -2 7 7\'%3E%3Cpath stroke=\'%23d9534f\' d=\'M0 0l3 3m0-3L0 3\'/%3E%3Ccircle r=\'.5\'/%3E%3Ccircle cx=\'3\' r=\'.5\'/%3E%3Ccircle cy=\'3\' r=\'.5\'/%3E%3Ccircle cx=\'3\' cy=\'3\' r=\'.5\'/%3E%3C/svg%3E')
-}
+ 
 
 @media (min-width:480px) {
 	.form-inline .form-group {

File diff suppressed because it is too large
+ 61 - 1414
Gameserver/Public/app_files/id.css


+ 8 - 17
Gameserver/Public/app_files/index_cn.css

@@ -70,8 +70,7 @@ a:active {
 }
 
 .service_list .head h2 { 
-    color: #212121;
-    color: ;
+    color: #212121; 
     font-size: 2.5625rem;
     text-align: center
 }
@@ -79,8 +78,7 @@ a:active {
 .service_list .head p {
 
     text-align: center;
-    color: #666666;
-    color:
+    color: #666666; 
 }
 
 .service_list .indeximg {
@@ -89,8 +87,7 @@ a:active {
 
 .service_list .service-list .nav-tabs-div {
     overflow: hidden;
-    background-color: #ffffff;
-    background-color: ;
+    background-color: #ffffff; 
     border-radius: 4px
 }
 
@@ -117,17 +114,14 @@ a:active {
 .service_list .server-tab li {
     text-align: center;
     padding: 40px 0 40px 0;
-    color: #666666;
-    color: ;
+    color: #666666; 
     -webkit-transition: all .2s;
     transition: all .2s;
     font-size: 14px
 }
 
 .service_list .server-tab .cur {
-    background: #004080;
-    background: #004080;
-    color: #212121;
+    background: #004080; 
     color: #ffffff
 }
 
@@ -182,8 +176,7 @@ a:active {
     overflow-y: auto;
 }
 
-.service_list .server-con-item-title {
-    color: #212121;
+.service_list .server-con-item-title { 
     color: #ffffff;
     font-size: 26px
 }
@@ -191,8 +184,7 @@ a:active {
 .service_list .server-con-item-des {
     width: 60px;
     height: 3px;
-    background-color: #ffffff;
-    background-color: ;
+    background-color: #ffffff; 
     margin-top: 10px
 }
 
@@ -222,8 +214,7 @@ a:active {
 .service_list .server-con-product-item p {
     overflow: hidden;
     white-space: nowrap;
-    text-overflow: ellipsis;
-    color: #212121;
+    text-overflow: ellipsis; 
     color: #ffffff
 }
 

+ 3 - 3
Gameserver/Public/gamesys/home/pages/login/login.js

@@ -1,6 +1,6 @@
 
 function login_click(){
-	var loginform = document.loginform 
-	loginform.action = getProviderUrl("login")
-	loginform.Submit()
+	var loginform = document.loginform ;
+	loginform.action = getProviderUrl("login");
+	loginform.Submit();
 }

Some files were not shown because too many files changed in this diff