Skip to content

phpdts
phpdts
Commit 0bb6551c authored by Nemo Ma's avatar Nemo Ma Committed by GitHub
Browse files
Options

Merge pull request #172 from clean-master/fix/club21-item-name 

修复合并名字代码片段的问题
parents ea84cc46 36b2f422
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 61 deletions
include/game/special.func.php
View file @ 0bb6551c
...@@ -536,7 +536,7 @@ function item_extract_trait($which, $item_position) ...@@ -536,7 +536,7 @@ function item_extract_trait($which, $item_position)
$itm = implode('', $matches[0]); $itm = implode('', $matches[0]);
$itm = (string)$itm; $itm = (string)$itm;
$itm = "名称" . $itm . '代码片段'; $itm = "🥚" . $itm . '🥚的代码片段';
$itmk = '🥚'; $itmk = '🥚';
$itme = '0'; $itme = '0';
$itms = '1'; $itms = '1';
...@@ -624,6 +624,7 @@ function item_extract_trait($which, $item_position) ...@@ -624,6 +624,7 @@ function item_extract_trait($which, $item_position)
//合并代码片段逻辑 //合并代码片段逻辑
function item_add_trait($choice1, $choice2) function item_add_trait($choice1, $choice2)
{ {
var_dump($choice1, $choice2);
global $log, $mode, $club, $sp, $rage, $pdata; global $log, $mode, $club, $sp, $rage, $pdata;
if ($club != 21) { if ($club != 21) {
$log .= '你的称号不能使用该技能。'; $log .= '你的称号不能使用该技能。';
...@@ -633,91 +634,104 @@ function item_add_trait($choice1, $choice2) ...@@ -633,91 +634,104 @@ function item_add_trait($choice1, $choice2)
//获取choice1和choice2的itm itmk itme itms itmsk //获取choice1和choice2的itm itmk itme itms itmsk
global ${'itm' . $choice1}, ${'itmk' . $choice1}, ${'itme' . $choice1}, ${'itms' . $choice1}, ${'itmsk' . $choice1}; global ${'itm' . $choice1}, ${'itmk' . $choice1}, ${'itme' . $choice1}, ${'itms' . $choice1}, ${'itmsk' . $choice1};
global ${'itm' . $choice2}, ${'itmk' . $choice2}, ${'itme' . $choice2}, ${'itms' . $choice2}, ${'itmsk' . $choice2}; global ${'itm' . $choice2}, ${'itmk' . $choice2}, ${'itme' . $choice2}, ${'itms' . $choice2}, ${'itmsk' . $choice2};
$itm1 = &${'itm' . $choice1}; $itmc1 = &${'itm' . $choice1};
$itmk1 = &${'itmk' . $choice1}; $itmkc1 = &${'itmk' . $choice1};
$itme1 = &${'itme' . $choice1}; $itmec1 = &${'itme' . $choice1};
$itms1 = &${'itms' . $choice1}; $itmsc1 = &${'itms' . $choice1};
$itmsk1 = &${'itmsk' . $choice1}; $itmskc1 = &${'itmsk' . $choice1};
$itm2 = &${'itm' . $choice2}; $itmc2 = &${'itm' . $choice2};
$itmk2 = &${'itmk' . $choice2}; $itmkc2 = &${'itmk' . $choice2};
$itme2 = &${'itme' . $choice2}; $itmec2 = &${'itme' . $choice2};
$itms2 = &${'itms' . $choice2}; $itmsc2 = &${'itms' . $choice2};
$itmsk2 = &${'itmsk' . $choice2}; $itmskc2 = &${'itmsk' . $choice2};
var_dump($itmc1, $itmc2);
//检查itmk1是否为🥚,itmk2是否为D或W开头或者是否为🥚 //检查itmk1是否为🥚,itmk2是否为D或W开头或者是否为🥚
if ($itmk1 != '🥚' || (strpos($itmk2, 'D') !== 0 && strpos($itmk2, 'W') !== 0 && ($itmk2 !== '🥚'))) { if ($itmkc1 != '🥚' || (strpos($itmkc2, 'D') !== 0 && strpos($itmkc2, 'W') !== 0 && ($itmkc2 !== '🥚'))) {
$log .= '该物品无法合并。<br>'; $log .= '该物品无法合并。<br>';
return; return;
} }
//让itm2属性合并itm1 //让itm2属性合并itm1
//如果都是🥚，则去掉$itm的所有“代码片段”四个字，然后itm相加 //如果都是🥚，则去掉$itm的所有“代码片段”四个字，然后itm相加
if ($itmk1 == '🥚' && $itmk2 == '🥚') { if ($itmkc1 == '🥚' && $itmkc2 == '🥚') {
$itm1 = str_replace('代码片段', '', $itm1); var_dump($itmkc1, $itmkc2);
//$itm2 = $itm1 . $itm2; var_dump($itmc1, $itmc2);
$itm2 = '🥚复合代码片段🥚'; preg_match_all('/(改|棍棒|\+(\\d+))/u', $itmc1, $matches1);
$itmk2 = $itmk1 . $itmk2; preg_match_all('/(改|棍棒|\+(\\d+))/u', $itmc2, $matches2);
$itme2 = (int)$itme1 + (int)$itme2; if (!empty($matches1[0]) || !empty($matches2[0])) {
$itmn_result = '';
foreach ($matches1[0] as $match) {
$itmn_result .= $match;
}
foreach ($matches2[0] as $match) {
$itmn_result .= $match;
}
$itmc2 = '🥚' . $itmn_result . '🥚复合代码片段';
}
else {
$itmc2 = '🥚复合代码片段🥚';
}
$itmkc2 = $itmkc1 . $itmkc2;
$itmec2 = (int)$itmec1 + (int)$itmec2;
//当任意一个itms为∞ //当任意一个itms为∞
if ($itms1 == '∞' || $itms2 == '∞') { if ($itmsc1 == '∞' || $itmsc2 == '∞') {
$itms2 = '∞'; $itms2 = '∞';
} }
else { else {
$itms2 = (int)$itms1 + (int)$itms2 - 1; $itms2 = (int)$itmsc1 + (int)$itmsc2 - 1;
} }
$itmsk2 = $itmsk1 . $itmsk2; $itmskc2 = $itmskc1 . $itmskc2;
$itmkc2 = '🥚';
//清空itm1 //清空itm1
$itm1 = ''; destory_single_item($pdata, $choice1);
$itmk1 = '';
$itme1 = '0';
$itms1 = '0';
$itmk2 = '🥚';
$itms2 -= 1;
return; return;
} }
if ($rage < 50 ) { elseif ($rage < 50 ) {
$log .= '怒气不足，无法合并代码片段。<br>'; $log .= '怒气不足，无法合并代码片段。<br>';
return; return;
} }
$rage -= 50; $rage -= 50;
//如果itm1是名称开头的 //如果itm1含有棍棒或者改或者n
if (strpos($itm1, '名称') === 0){ preg_match_all('/(改|棍棒|\+(\\d+))/u', $itmc1, $matches);
//去掉名称和代码片段后合并 if (!empty($matches[0]))
$itm1 = str_replace('名称', '', $itm1); {
$itm1 = str_replace('代码片段', '', $itm1); $itmn_result = '';
//var_dump($itm1); //合并match
//$itm2 = $itm1 . $itm2; foreach ($matches[0] as $match) {
$itm2 = '🥚' . $itm1 . '🥚的复合代码片段'; $itmn_result .= $match;
$itmk2 = $itmk1 . $itmk2; }
$itme2 = (int)$itme1 + (int)$itme2; $itmc2 = $itmc2 . $itmn_result;
$itmkc2 = $itmkc1 . $itmkc2;
$itmec2 = (int)$itmec1 + (int)$itmec2;
//当任意一个itms为∞ //当任意一个itms为∞
if ($itms1 == '∞' || $itms2 == '∞') { if ($itmsc1 == '∞' || $itmsc2 == '∞') {
$itms2 = '∞'; $itmsc2 = '∞';
} }
else { else {
$itms2 = (int)$itms1 + (int)$itms2 - 1; $itmsc2 = (int)$itmsc1 + (int)$itmsc2 - 1;
} }
$itmsk2 = $itmsk1 . $itmsk2; $itmskc2 = $itmskc1 . $itmskc2;
//清空itm1 //清空itm1
destory_single_item($pdata, $choice1); destory_single_item($pdata, $choice1);
$itmk2 = str_replace('🥚', '', $itmk2); $itmkc2 = str_replace('🥚', '', $itmkc2);
return; return;
} }
$itmk2 = $itmk1 . $itmk2; $itmkc2 = $itmkc1 . $itmkc2;
$itme2 = (int)$itme1 + (int)$itme2; $itmec2 = (int)$itmec1 + (int)$itmec2;
//当任意一个itms为∞ //当任意一个itms为∞
if ($itms1 == '∞' || $itms2 == '∞') { if ($itmsc1 == '∞' || $itmsc2 == '∞') {
$itms2 = '∞'; $itmsc2 = '∞';
} }
else { else {
$itms2 = (int)$itms1 + (int)$itms2 - 1; $itmsc2 = (int)$itmsc1 + (int)$itmsc2 - 1;
} }
$itmsk2 = $itmsk1 . $itmsk2; $itmskc2 = $itmskc1 . $itmskc2;
//清空itm1 //清空itm1
destory_single_item($pdata, $choice1); destory_single_item($pdata, $choice1);
//去除itm2重复的属性 //去除itm2重复的属性
$itmsk2 = implode(array_unique(str_split($itmsk2))); $itmskc2 = implode(array_unique(str_split($itmskc2)));
//去除itm2属性里的🥚 //去除itm2属性里的🥚
$itmk2 = str_replace('🥚', '', $itmk2); $itmkc2 = str_replace('🥚', '', $itmkc2);
} }
function shoplist($sn,$getlist=NULL) { function shoplist($sn,$getlist=NULL) {
......
templates/default/sp_terminal.htm
View file @ 0bb6551c
...@@ -38,16 +38,6 @@ ...@@ -38,16 +38,6 @@
<span class="eicon" onmousedown="changeVolume(0.05);">⏫</span> <span class="eicon" onmousedown="changeVolume(0.05);">⏫</span>
</td> </td>
</tr> </tr>
<!-- 录制按钮 -->
<tr height="24">
<TD colspan="2" class=b1>录制与回放</TD>
</tr>
<tr class="map" height="32">
<td colspan="2">
<button onclick="startRecording(); return false;">开始录制</button>
<button onclick="downloadRecordedData()">下载录制文件</button>
</td>
</tr>
</table> </table>
<!-- 战场控制指令 --> <!-- 战场控制指令 -->
<!--{if !isset($clbpara['console'])}--> <!--{if !isset($clbpara['console'])}-->
......
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