diff --git a/LogicServer/data/config/actigiftbag/actigift.txt b/LogicServer/data/config/actigiftbag/actigift.txt deleted file mode 100755 index 653411f..0000000 --- a/LogicServer/data/config/actigiftbag/actigift.txt +++ /dev/null @@ -1,15 +0,0 @@ ---#include "..\..\language\LangCode.txt" once ---通用活动礼包配置 -ActiGiftBagConfig = -{ - ---------------------------------前端礼包常量 ActiGiftBagConst actiType ---活动列表 -commonList= -{ ---2015春节活动-祈福迎神 type=1039 ---#include "actigiftbags/SF2015/SF2015BlessToSprirt.txt" -}, - - -} \ No newline at end of file diff --git a/LogicServer/data/config/actigiftbag/actigiftbags/SF2015/SF2015BlessToSprirt.txt b/LogicServer/data/config/actigiftbag/actigiftbags/SF2015/SF2015BlessToSprirt.txt deleted file mode 100755 index 0c10aee..0000000 --- a/LogicServer/data/config/actigiftbag/actigiftbags/SF2015/SF2015BlessToSprirt.txt +++ /dev/null @@ -1,87 +0,0 @@ ---娴嬭瘯 鏄ヨ妭娲诲姩-绁堢杩庣 type=1039 -{ - --娲诲姩绫诲瀷. --鎻忚堪 - type=1039, - --鎬墿Id - name=1356, - info=OldLang.Script.wildBossScene001, - - actiList= - { - - { - --娲诲姩id - id=1, - --鍚嶇О:鍠滄皵绀煎寘(鍏嶈垂棰嗗彇) - name=OldLang.Script.wildBossScene001, - --XX绀煎寘鍚嶇О - info=OldLang.Script.wildBossScene001, - --鏈澶у彲棰嗗彇 - exValue=1, - - --鍏嶈垂棰 - costAwards= - { - { type = 15,count = 0,}, - }, - - --鑾峰緱鐨勫鍔 - awards = - { - { type = 0, id = 2986, count = 2,}, - { type = 0, id = 3380, count = 2,}, - { type = 0, id = 3386, count = 5,}, - }, - }, - - { - --娲诲姩id --瀵瑰簲鏈嶅姟鍣↖d - id=2, - --鍚嶇О - name=OldLang.Script.wildBossScene002, - --XX绀煎寘鍚嶇О - info=OldLang.Script.wildBossScene002, - --鏈澶у彲棰嗗彇 - exValue=10, - --棰嗗彇鑺辫垂鍏冨疂 - costAwards= - { - { type = 15,count = 50,}, - }, - --鑾峰緱鐨勫鍔 - awards = - { - { type = 0, id = 2745, count = 1,}, - { type = 0, id = 2986, count = 3,}, - { type = 0, id = 3380, count = 3,}, - { type = 0, id = 3386, count = 5,}, - }, - }, - - { - --娲诲姩id - id=3, - --鍚嶇О - name=OldLang.Script.wildBossScene003, - --XX绀煎寘鍚嶇О - info=OldLang.Script.wildBossScene003, - --鏈澶у彲棰嗗彇 - exValue=10, - --棰嗗彇鑺辫垂鍏冨疂 - costAwards= - { - { type = 15,count = 100,}, - }, - --鑾峰緱鐨勫鍔 - awards = - { - { type = 0, id = 3304, count = 1 ,}, - { type = 0, id = 3379, count = 2 ,}, - { type = 0, id = 2986, count = 5 ,}, - { type = 0, id = 3380, count = 5 ,}, - { type = 0, id = 3386, count = 10,}, - }, - }, - }, - -}, \ No newline at end of file diff --git a/LogicServer/data/functions/Activity/Activitys.txt b/LogicServer/data/functions/Activity/Activitys.txt index 48d6c3f..2714301 100755 --- a/LogicServer/data/functions/Activity/Activitys.txt +++ b/LogicServer/data/functions/Activity/Activitys.txt @@ -37,10 +37,10 @@ require("Activity.ActivityType10009") --涓汉娲诲姩锛氳揪鏍囨椿鍔 require("Activity.ActivityType10010") --涓汉娲诲姩锛氬瀹濇椿鍔 require("Activity.ActivityType10015") --鍏ㄥ眬涓汉娲诲姩锛氭瘡鍛ㄥ浐瀹氭椂闂寸殑绀煎寘娲诲姩 require("Activity.ActivityType10017") --鍏戞崲娲诲姩 -require("Activity.ActivityType10019") -- -require("Activity.ActivityLuckyTree") -- -require("Activity.ActivityOnlineMin") -- -require("Activity.ActivityType10020") -- +require("Activity.ActivityType10019") --涓汉娲诲姩锛氳揪鏍囨椿鍔 +require("Activity.ActivityLuckyTree") --鎽囬挶鏍 +require("Activity.ActivityOnlineMin") --绱鍦ㄧ嚎 +require("Activity.ActivityType10020") --涓汉娲诲姩锛氬瀹 require("Activity.ActivityType10021") --涓汉娲诲姩锛氫簩鍏 require("Activity.ActivityType10033") --鍖烘湇鍐犲悕