Skip to content

phpdts
phpdts
Commit e1be2473 authored by hisuinohoshi's avatar hisuinohoshi
Browse files
Options

update & fix 

变化：
- tooltip与部分页面样式调整；

修正：
- 杂项成就统计时没有正确保存数据的问题；
- 解析空成就数据时没有返回空数组的问题；
- 混沌伤害成就重复触发的问题；
parent dd51ab34
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 27 deletions
gamedata/cache/style_20190718.css
View file @ e1be2473
...@@ -371,15 +371,14 @@ span[tooltip] { ...@@ -371,15 +371,14 @@ span[tooltip] {
} }
span[tooltip]:hover:before { span[tooltip]:hover:before {
content: attr(tooltip); content: attr(tooltip);
padding: 5px; font: 8pt "微软雅黑" serif; color: rgba(225, 124, 226, 1);
overflow: visible; padding: 7px; text-align: left; white-space:pre-line;
font: bold 10pt "微软雅黑" serif; color: white; text-shadow:1px 1px 1px rgb(106, 0, 108); text-fill-color: rgb(245, 174, 246); -webkit-text-fill-color: rgb(245, 174, 246);
white-space:pre-line; /*background-clip: border-box; background-color: rgba(198, 114, 199, 0.8);*/
text-shadow:3px 3px 3px #3b3535; text-align: center; text-fill-color: white; -webkit-text-fill-color: white; background-color:rgba(0,0,0,0.8); *BACKGROUND: rgb(0,0,0); *filter:alpha(opacity=70);
background-size: 0; background-clip: border-box; background-color: rgba(198, 114, 199, 0.8); border-radius: 3px; border:2px solid rgba(225, 124, 226, 0.4);
border-radius: 4px; z-index: 50; transform: translate(40px, -5px);
transform: translate(-5px, 20px); width:max-content; max-width: 175px; position: absolute; z-index: 50;
width: 160px; max-width: 160px; position: absolute;
} }
/* 下拉菜单样式 */ /* 下拉菜单样式 */
...@@ -396,10 +395,14 @@ span.drop:hover .dropdown-menu{ ...@@ -396,10 +395,14 @@ span.drop:hover .dropdown-menu{
/*下拉菜单样式本体*/ /*下拉菜单样式本体*/
.dropdown-menu{ .dropdown-menu{
display: none; display: none;
background-size: 0; background-clip: border-box; background-color: rgba(80, 62, 80, 0.75);*BACKGROUND:rgb(17,17,17); *filter:alpha(opacity=50); font: 10pt "微软雅黑" serif; color: rgba(225, 124, 226, 1);
top:17px; left:-5px; border-radius: 4px; text-align: center;
width: 80px; max-width: 80px; text-shadow:1px 1px 1px rgb(106, 0, 108); text-fill-color: rgb(245, 174, 246); -webkit-text-fill-color: rgb(245, 174, 246);
z-index:10; position: absolute; background-clip: border-box;
background-color:rgba(0,0,0,0.7); *BACKGROUND: rgb(0,0,0); *filter:alpha(opacity=70);
border-radius: 3px; border:1px solid rgba(225, 124, 226, 0.4);
top:17px; left: -5px;
width: 80px; max-width: 80px; position: absolute; z-index:10;
} }
/*去除下拉菜单内<ul>标签的样式*/ /*去除下拉菜单内<ul>标签的样式*/
.dropdown-menu ul{ .dropdown-menu ul{
...@@ -409,11 +412,10 @@ span.drop:hover .dropdown-menu{ ...@@ -409,11 +412,10 @@ span.drop:hover .dropdown-menu{
} }
/*改变下拉菜单内<li>标签的样式*/ /*改变下拉菜单内<li>标签的样式*/
.dropdown-menu li{ .dropdown-menu li{
list-style: none;
padding: 2px; padding: 2px;
list-style: none;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font: bold 10pt "微软雅黑" serif; color: white; overflow-x:hidden; overflow-y:auto; text-shadow:3px 3px 3px #231e1e; text-align: center;
} }
/* 在小头像上悬浮显示大头像 */ /* 在小头像上悬浮显示大头像 */
...@@ -571,7 +573,7 @@ div.ach_box ...@@ -571,7 +573,7 @@ div.ach_box
{ {
background-color:rgba(20,22,24,0.5); *BACKGROUND: rgb(20,22,24); *filter:alpha(opacity=50); background-color:rgba(20,22,24,0.5); *BACKGROUND: rgb(20,22,24); *filter:alpha(opacity=50);
display:Inline-block; display:Inline-block;
width:320px; min-height:106px;text-align:left; vertical-align:top; width:320px; min-height:106px;text-align:left; vertical-align:middle;
margin:5px; border:1px solid rgba(225, 124, 226, 0.4); border-radius:7px; margin:5px; border:1px solid rgba(225, 124, 226, 0.4); border-radius:7px;
} }
......
include/game/achievement.func.php
View file @ e1be2473
...@@ -46,7 +46,7 @@ function print_achievement_rev($ach) ...@@ -46,7 +46,7 @@ function print_achievement_rev($ach)
$ach = json_decode($ach,true); $ach = json_decode($ach,true);
return $ach; return $ach;
} }
return $ach; return Array();
} }
function check_achievement_rev($which,$who) function check_achievement_rev($which,$who)
...@@ -1573,7 +1573,7 @@ function check_item_achievement_rev($nn,$i,$ie,$is,$ik,$isk) ...@@ -1573,7 +1573,7 @@ function check_item_achievement_rev($nn,$i,$ie,$is,$ik,$isk)
} }
} }
function check_misc_achievement_rev($pa,$pd) function check_misc_achievement_rev(&$pa)
{ {
global $gamestate,$gamecfg,$db,$tablepre; global $gamestate,$gamecfg,$db,$tablepre;
include_once GAME_ROOT.'./include/game/titles.func.php'; include_once GAME_ROOT.'./include/game/titles.func.php';
...@@ -1591,6 +1591,7 @@ function check_misc_achievement_rev($pa,$pd) ...@@ -1591,6 +1591,7 @@ function check_misc_achievement_rev($pa,$pd)
// 204.混沌伤害打满成就 // 204.混沌伤害打满成就
if(!empty($pa['clbpara']['achvars']['full_chaosdmg'])) if(!empty($pa['clbpara']['achvars']['full_chaosdmg']))
{ {
unset($pa['clbpara']['achvars']['full_chaosdmg']);
$aid = 204; $aid = 204;
$alvl = check_achievement_rev($aid,$nn); $alvl = check_achievement_rev($aid,$nn);
$achlist = get_achlist($aid); $achlist = get_achlist($aid);
...@@ -1609,6 +1610,7 @@ function check_misc_achievement_rev($pa,$pd) ...@@ -1609,6 +1610,7 @@ function check_misc_achievement_rev($pa,$pd)
// 205.一击承受百万伤害成就 // 205.一击承受百万伤害成就
if(!empty($pa['clbpara']['achvars']['takedmg']) && $pa['clbpara']['achvars']['takedmg'] >= 1000000) if(!empty($pa['clbpara']['achvars']['takedmg']) && $pa['clbpara']['achvars']['takedmg'] >= 1000000)
{ {
unset($pa['clbpara']['achvars']['takedmg']);
$aid = 205; $aid = 205;
$alvl = check_achievement_rev($aid,$nn); $alvl = check_achievement_rev($aid,$nn);
$achlist = get_achlist($aid); $achlist = get_achlist($aid);
......
include/game/revcombat.func.php
View file @ e1be2473
...@@ -384,6 +384,11 @@ ...@@ -384,6 +384,11 @@
# 战斗准备事件中触发了跳过战斗标记，直接goto跳转到这个位置。 # 战斗准备事件中触发了跳过战斗标记，直接goto跳转到这个位置。
battle_finish_flag: battle_finish_flag:
# 检查战斗中出现的杂项成就
include_once GAME_ROOT.'./include/game/achievement.func.php';
if(!$pa['type']) check_misc_achievement_rev($pa);
if(!$pd['type']) check_misc_achievement_rev($pd);
# 如果战斗中出现了死者 更新action标记 # 如果战斗中出现了死者 更新action标记
if ($active) if ($active)
{ {
...@@ -422,11 +427,6 @@ ...@@ -422,11 +427,6 @@
player_save($pa); player_save($pd); player_save($pa); player_save($pd);
} }
# 检查战斗中出现的杂项成就
include_once GAME_ROOT.'./include/game/achievement.func.php';
if(!$pa['type']) check_misc_achievement_rev($pa,$pd);
if(!$pd['type']) check_misc_achievement_rev($pd,$pa);
# 刷新玩家状态 # 刷新玩家状态
if(!$sdata['type']) player_load($sdata); if(!$sdata['type']) player_load($sdata);
# 主视角不是玩家，可能是玩家召唤的NPC帮手。将身上的印记传给玩家。 # 主视角不是玩家，可能是玩家召唤的NPC帮手。将身上的印记传给玩家。
......
include/global.func.php
View file @ e1be2473
...@@ -647,7 +647,7 @@ function parse_info_desc($info,$type,$vars='',$short=0) ...@@ -647,7 +647,7 @@ function parse_info_desc($info,$type,$vars='',$short=0)
{ {
if($sk_max > 1) if($sk_max > 1)
{ {
$sk_tp .= "【{$itemspkinfo[$sk]}】".$tps_isk[$sk]['title']; $sk_tp .= "【{$itemspkinfo[$sk]}】: ".$tps_isk[$sk]['title'];
if($sk_nums<$sk_max-1) $sk_tp .= "\r"; if($sk_nums<$sk_max-1) $sk_tp .= "\r";
} }
else else
......
templates/default/vnworld.htm
View file @ e1be2473
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<div id="notice"></div> <div id="notice"></div>
<div class="subtitle">空想梦境</div> <div class="subtitle">空想梦境</div>
<center> <center>
<div class="clearfix"> <div class="ach_box" style="min-height: min-content; width: max-content; max-width: 560px;">
<table class="dialogue" border="1" cellspacing="0" cellpadding="0" valign="middle"> <table>
<tr> <tr>
<td> <td>
<IMG width=140px src="$vnworld_img" valign="middle"/> <IMG width=140px src="$vnworld_img" valign="middle"/>
</td> </td>
<td style="padding: 1% 1%;"> <td class="ach-cont">
<span class="evergreen">$vnworld_notice</span> <span class="evergreen">$vnworld_notice</span>
</td> </td>
</tr> </tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment