Skip to content

Commit

Permalink
Merge branch 'Unstable'
Browse files Browse the repository at this point in the history
  • Loading branch information
winddramon committed Feb 15, 2018
2 parents 3f87e6e + 2d150db commit a45e23e
Show file tree
Hide file tree
Showing 15 changed files with 252 additions and 83 deletions.
1 change: 1 addition & 0 deletions gamedata/modules.list.php
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@
skill261,extra/club/skills/skill261/,1
skill274,extra/club/skills/skill274/,1
skill361,extra/activities/lunany2018/skill361/,1
skill362,extra/activities/lunany2018/skill362/,1
skill20,extra/club/skills/skill20/,1
skill203,extra/club/skills/skill203/,1
dualwep,base/weapon/dualwep/,1
Expand Down
36 changes: 21 additions & 15 deletions include/modules/extra/achievement/achievement.readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
5 305 结局成就(10) 幸存结局的成就
6 306 结局成就(10) 核爆结局的成就
7 307 结局成就(10) 解离结局的成就
8 308 光辉事迹(2) 5分内合成KEY催泪弹的成就
9 309 光辉事迹(2) 15分内合成贤者的成就
8 308 竞速挑战(2) 5分内合成KEY催泪弹的成就
9 309 竞速挑战(2) 15分内合成贤者的成就
10 310 战斗成就(3) 击杀NPC的成就
11 311 战斗成就(3) 击杀玩家的成就
12 312 战斗成就(3) 击杀SCP的成就
13 313 挑战成就(4) 1禁打钱模式
13 313 特殊挑战(4) 1禁打钱模式
14 314 日常任务(20) 杀10NPC
15 315 日常任务(20) 杀1玩家(改为活跃玩家)
16 316 日常任务(20) 杀200杂兵
Expand All @@ -23,11 +23,11 @@
19 319 日常任务(20) 合成游戏王卡(同上废弃)
20 320 日常任务(20) 合成KEY弹(同上废弃)
21 321 日常任务(20) 杀2全息
22 322 光辉事迹(2) 30分死斗
23 323 光辉事迹(2) 45分解离
22 322 竞速挑战(2) 30分死斗
23 323 竞速挑战(2) 45分解离
24 324 日常任务(20) 达到20级
25 325 挑战成就(4) 常磐之心活动
26 326 挑战成就(4) 使用不同身份卡获得胜利
25 325 特殊挑战(4) 常磐之心活动
26 326 特殊挑战(4) 使用不同身份卡获得胜利
27 327 2017十一特殊活动(31) 荣耀房杀全息幻象
28 328 2017十一特殊活动(31) 荣耀房杀玩家
29 329 2017十一特殊活动(31) 荣耀房使用破灭之诗
Expand All @@ -48,13 +48,19 @@
44 344 日常任务(20) 使用KEY弹杀死1名活跃玩家
45 345 日常任务(20) 使用小黄道具杀死1名活跃玩家
46 346 日常任务(20) 使用陷阱杀死1名活跃玩家
47 347 挑战成就(4) 游戏开始10分钟后入场并取得游戏胜利
48 348 挑战成就(4) 使用C/M级卡片入场并杀死使用S/A级卡片的活跃玩家
47 347 特殊挑战(4) 游戏开始10分钟后入场并取得游戏胜利
48 348 特殊挑战(4) 使用C/M级卡片入场并杀死使用S/A级卡片的活跃玩家
49 349 日常任务(20) 在危险地区击杀活跃玩家
50 350 结局成就(10) 极速模式解禁
51 351 挑战成就(4) 除错模式层数
52 352 挑战成就(4) 除错模式名次
53 353 挑战成就(1) 合成一发逆转神话
54 354 挑战成就(1) 合成绝冲大剑
55 355 挑战成就(1) 合成概念武装破则
56 356 战斗成就(3) 一场用3种方式击杀玩家
51 351 特殊挑战(4) 除错模式层数
52 352 特殊挑战(4) 除错模式名次
53 353 道具成就(1) 合成一发逆转神话
54 354 道具成就(1) 合成绝冲大剑
55 355 道具成就(1) 合成概念武装破则
56 356 战斗成就(3) 一场用4种方式击杀玩家
57 357 道具成就(1) 合成模式EX
58 358 道具成就(1) 合成方块系道具
59 359 竞速挑战(2) 极速模式15分钟解禁
60 360 2018春节活动(33) 金钱尾数888
61 361 2018春节活动(33) 使用挑战者获胜
62 362 2018春节活动(33)
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
20=>array(314,315,316,317,318,319,320,321,324,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,349),
31=>array(327,328,329),
32=>array(330,331),
33=>array(360,361),
33=>array(360,361,362),
);

//成就起止时间,如果设置,则只认非零的数据
Expand Down Expand Up @@ -56,6 +56,7 @@
350 => array(19),//极速模式解禁胜利
351 => array(1),//除错模式
352 => array(1),//除错模式
358 => array(0, 4),//合成方块系道具,由于掉落表不同,只允许标准、卡片完成
359 => array(19),//极速模式10分钟胜利
361 => array(0, 4),//2018年春节活动2
);
Expand Down
15 changes: 10 additions & 5 deletions include/modules/extra/achievement/achievement_base/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ function update_achievements_by_udata(&$udata, &$pdata)
if ($vflag){
$func='\\skill'.$key.'\\finalize'.$key;
if(function_exists($func)) $ret=$func($pdata,$val);//兼容性代码,如果存在旧式的结算函数,就按旧式结算函数算
else $ret = ach_finalize($pdata, $val, $key);
else $ret = ach_finalize($pdata, $udata, $val, $key);

$udata['u_achievements'][$key]=$ret;
}
Expand Down Expand Up @@ -418,7 +418,7 @@ function ach_create_prize_message($pa, $achid, $c, $getqiegao=0, $getcard=0, $ex

//成就通用结算函数,需要成就模块里至少定义$achXXX_threshold
//$data是既有进度,新进度怎么判定请继承ach_finalize_process()自定义
function ach_finalize(&$pa, $data, $achid)
function ach_finalize(&$pa, &$ud, $data, $achid)
{
if (eval(__MAGIC__)) return $___RET_VALUE;
if (!$data)
Expand Down Expand Up @@ -457,8 +457,10 @@ function ach_finalize(&$pa, $data, $achid)
if($card_flag && !empty($card_prize[$tk])) {
$getcard = $card_prize[$tk];
if(is_array($getcard)) {
$cardlist_got = explode('_', $ud['cardlist']);
$getcard = array_diff($getcard, $cardlist_got);//优先获得没有拿到过的卡
if(empty($getcard)) $getcard = $card_prize[$tk];//如果这个卡集全部获得了,那么随机一个
shuffle($getcard);
//$getcard = $getcard[0];
$getcard = $getcard[0];
}
//\cardbase\get_card($card_got,$pa);
Expand Down Expand Up @@ -588,8 +590,11 @@ function show_prize_single($cn, $achid){
$ret1 = '';
foreach($cp as $card) {
$ret1 .= show_prize_single_card($card);
if(count($cp) > 1) $ret1 .= '|';
}
$ret .= '<span class="evergreen" title="'.str_replace('"',"'",$ret1).'">卡集(悬浮查看)</span>';
if(substr($ret1,strlen($ret1)-1) === '|') $ret1 = substr($ret1,0,-1);
$ret1 = str_replace('|','',$ret1);
$ret .= '<span class="evergreen" title="'.str_replace('"',"'",$ret1).'">卡集(悬浮查看)中随机卡片1张</span>';
}elseif($cp){
$card = (int)$cp;
$ret .= '<span class="evergreen">卡片</span> '.show_prize_single_card($card);
Expand All @@ -604,7 +609,7 @@ function show_prize_single_card($card)
{
if (eval(__MAGIC__)) return $___RET_VALUE;
eval(import_module('cardbase'));
return '<span class="'.$card_rarecolor[$cards[$card]['rare']].'">'.$cards[$card]['name'].'</span> ';
return '<span class="'.$card_rarecolor[$cards[$card]['rare']].'">'.$cards[$card]['name'].'</span>';
}

//判定是不是活跃玩家的通用函数
Expand Down
2 changes: 1 addition & 1 deletion include/modules/extra/achievement/skills/skill308/desc.htm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<!--{if ($c308) }--><span class="lime">[完成]</span><!--{else}--><span class="red">[未完成]</span><!--{/if}--><br>
<font color="yellow">最快速度: {$p308}秒<br></font>
<font color="olive">奖励: 切糕666 <br></font>
在开局5分钟内合成物品【KEY系催泪弹】<br>
在开局5分钟内合成物品【KEY系催泪弹】。房间内无法完成<br>
</td>
</tr></table>
2 changes: 1 addition & 1 deletion include/modules/extra/achievement/skills/skill309/desc.htm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<!--{if ($c309) }--><span class="lime">[完成]</span><!--{else}--><span class="red">[未完成]</span><!--{/if}--><br>
<font color="yellow">最快速度: {$p309}秒<br></font>
<font color="olive">奖励: 切糕666 <span class="evergreen">卡片</span> <span class="clan">方块挑战者</span><br></font>
在开局15分钟内合成物品火水木金土符『贤者之石』<br>
在开局15分钟内合成火水木金土符『贤者之石』。房间内无法完成<br>
</td>
</tr></table>
2 changes: 1 addition & 1 deletion include/modules/extra/achievement/skills/skill322/desc.htm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<!--{if ($c322) }--><span class="lime">[完成]</span><!--{else}--><span class="red">[未完成]</span><!--{/if}--><br>
<font color="yellow">最快速度: {$p322}秒<br></font>
<font color="olive">奖励: 切糕666 <span class="evergreen">卡片</span> <span class="brickred b">死斗挑战者</span><br></font>
在开局30分钟内开启死斗模式<br>
在开局30分钟内开启死斗模式。房间内无法完成<br>
</td>
</tr></table>
2 changes: 1 addition & 1 deletion include/modules/extra/achievement/skills/skill323/desc.htm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<!--{if ($c323) }--><span class="lime">[完成]</span><!--{else}--><span class="red">[未完成]</span><!--{/if}--><br>
<font color="yellow">最快速度: {$p323}秒<br></font>
<font color="olive">奖励: 切糕666 <span class="gold b">随机S级卡片</span><br></font>
在开场45分钟内完成幻境解离<br>
在开场45分钟内完成幻境解离。解离模式以外的房间无法完成<br>
</td>
</tr></table>
10 changes: 5 additions & 5 deletions include/modules/extra/achievement/skills/skill358/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

//各级显示的要求,如果不存在则取低的
$ach358_desc= array(
1=>'合成方块系道具<:threshold:>次',
1=>'合成方块系道具<:threshold:>次。房间内无法完成',
);

$ach358_proc_words = '目前进度';
Expand All @@ -21,16 +21,16 @@
//各级阈值,注意是达到这个阈值则升到下一级
$ach358_threshold = array(
1 => 5,
2 => 15,
3 => 60,
2 => 20,
3 => 100,
999 => NULL
);

//各级给的切糕奖励
$ach358_qiegao_prize = array(
1 => 150,
2 => 400,
3 => 1600,
2 => 500,
3 => 1800,
);

//各级给的切糕奖励
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

//各级给的卡片奖励
$ach360_card_prize = array(
3 => 164,
);

function init()
Expand Down
90 changes: 90 additions & 0 deletions include/modules/extra/activities/lunany2018/skill362/main.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?php

namespace skill362
{
//各级要完成的成就名,如果不存在则取低的
$ach362_name = array(
1=>'红包拿来 LV1',
2=>'红包拿来 LV2',
3=>'红包拿来 LV3',
);

//各级显示的要求,如果不存在则取低的
$ach362_desc= array(
1=>'击杀NPC获得的切糕数目达到<:threshold:>',
);

$ach362_proc_words = '目前进度';

$ach362_unit = '切糕';

//各级阈值,注意是达到这个阈值则升到下一级
$ach362_threshold = array(
1 => 100,
2 => 800,
3 => 6400,
999 => NULL
);

//各级给的切糕奖励
$ach362_qiegao_prize = array(
1 => 66,
2 => 666,
3 => 6666,
);

//各级给的卡片奖励
$ach362_card_prize = array(
3 => array(200, 201, 202, 203, 204),
);

function init()
{
define('MOD_SKILL362_INFO','achievement;spec-activity;');
define('MOD_SKILL362_ACHIEVEMENT_ID','62');
}

function acquire362(&$pa)
{
if (eval(__MAGIC__)) return $___RET_VALUE;
\skillbase\skill_setvalue(362,'cnt','0',$pa);
}

function lost362(&$pa)
{
if (eval(__MAGIC__)) return $___RET_VALUE;
}

function ach_finalize_process(&$pa, $data, $achid)
{
if (eval(__MAGIC__)) return $___RET_VALUE;
$ret = $chprocess($pa, $data, $achid);
if($achid == 362){
$var = (int)\skillbase\skill_getvalue($achid,'cnt',$pa);
$ret += $var;
}
return $ret;
}

function show_achievement_icon($achid, $c, $top_flag)
{
if (eval(__MAGIC__)) return $___RET_VALUE;
$ret = $chprocess($achid, $c, $top_flag);
if(362 == $achid) {
$ret = \skill360\get_lny2018_icon($achid, $c, $top_flag);
}
return $ret;
}

function battle_get_qiegao(&$pa,&$pd,$active){
if (eval(__MAGIC__)) return $___RET_VALUE;
$ret = $chprocess($pa,$pd,$active);
if(\skillbase\skill_query(362,$pa)) {
$cnt353 = (int)\skillbase\skill_getvalue(362,'cnt',$pa);
\skillbase\skill_setvalue(362,'cnt',$cnt353+$ret,$pa);
}
return $ret;
}
}

?>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

namespace skill362
{
////////// MODULE HEADER START ///////////////
$___MODULE_dependency = 'skillbase sys player achievement_base skill360 cardbase';
$___MODULE_dependency_optional = '';
$___MODULE_conflict = '';
$___MODULE_codelist = 'main.php';
$___MODULE_templatelist = '';
////////// MODULE HEADER END /////////////////
require __INIT_MODULE__(__NAMESPACE__,__DIR__);
}

?>
23 changes: 22 additions & 1 deletion include/modules/extra/card/cardbase/config/card.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
$cardindex=array(
'S'=>array(1,5,16,38,39,40,41,64,65,67,71,95,99,100,101,102,117,145,152,153),
'A'=>array(2,13,14,20,22,23,26,27,32,37,43,44,45,46,47,48,49,50,68,72,75,81,103,104,105,106,120,121,124,135,136,137,139,141,148,154),
'B'=>array(3,12,15,21,24,25,28,35,51,52,53,54,55,56,66,69,70,76,78,80,83,97,108,109,110,111,112,123,140,142,144,146,147,149,157,161,163),
'B'=>array(3,12,15,21,24,25,28,35,51,52,53,54,55,56,66,69,70,76,78,80,83,97,108,109,110,111,112,123,140,142,144,146,147,149,157,161,163,164),
'C'=>array(4,6,7,8,9,10,11,17,18,19,29,30,31,33,34,36,57,58,59,60,61,62,73,74,77,79,82,84,85,107,113,114,115,116,122,138,143,150,155),
'M'=>array()
//M卡的爆率实际属于C
Expand Down Expand Up @@ -2518,6 +2518,27 @@
'wepsk' => 'z',
)
),
164 => array(
'name' => '发财挑战者',
'rare' => 'B',
'pack' => 'Way of Life',
'desc' => '这个人有两大爱好,一是叫爸爸,二是假装自己是SCP',
'effect' => '开局金钱是88,经验、怒气、全熟、歌魂和最大歌魂都是8',
'energy' => 88,
'valid' => array(
'money' => '88',
'exp' => '8',
'rage' => '8',
'wp' => '8',
'wk' => '8',
'wg' => '8',
'wc' => '8',
'wd' => '8',
'wf' => '8',
'ss' => '8',
'mss' => '8',
)
),
/////////////////////////////////////////////////


Expand Down
Loading

0 comments on commit a45e23e

Please sign in to comment.