Explorar el Código

init7日数据

cyzhao hace 1 año
padre
commit
9e2df62e32

+ 0 - 5
Gameserver/App/base/CmdCode.php

@@ -100,11 +100,6 @@ class CmdCode {
      */
     const active_day7_drawreward = 6101;
 
-    /**
-     * 7日累充奖励领取
-     */
-    const active_day7_accumulateDrawreward = 6102;
-
     // </editor-fold>
     // <editor-fold defaultstate="collapsed" desc="任务操作码 - 62xx">
 

+ 352 - 355
Gameserver/App/model/Const/GameConfig.php

@@ -1,39 +1,36 @@
 <?php
-
 ////////////////////
-// 由CodeGenerator创建。
-// Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
-// author: gwang
-// 日期: 2024-05-22 11:03:34
+ // 由CodeGenerator创建。
+ // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
+ // author: gwang 
+ // 日期: 2024-05-22 15:57:06
 ////////////////////
 
 /**
- * 常量配置数据
+ * 常量配置数据 
  */
 class GameConfig {
-// <editor-fold defaultstate="collapsed" desc="  基础代码 ">
-
+// <editor-fold defaultstate="collapsed" desc="  基础代码 ">    
     /**
-     * 是否启用codegen
+     * 是否启用codegen 
      */
-    private static function isCG() {
-        return defined('CodeGen_Enabled') && CodeGen_Enabled;
+    private static function isCG()  {
+        return defined('CodeGen_Enabled') && CodeGen_Enabled; 
     }
-
     /**
      * @var bool 分区是否使用独立的常量配置数据
      */
     private static $useZoneId = false;
-
     /**
      * 追加分区列表字符串
      * @return string
      */
-    private static function zoneid() {
+    private static function zoneid()
+    {
         global $zoneid;
         return self::$useZoneId ? "-zone$zoneid" : "";
     }
-
+	
     /**
      * @return ClientVersion
      */
@@ -85,545 +82,545 @@ class GameConfig {
         }
         return null;
     }
-
 // </editor-fold>
-
     /**
-     * 全局参数
-     * @return \globalsettings
-     */
-    public static function globalsettings() {
-        static $a = null;
+    * 全局参数
+    * @return \globalsettings
+    */
+    public static function globalsettings()
+    { 
+        static $a = null; 
         return self::initValue($a, 'globalsettings');
     }
-
     /**
-     * 停服计划
-     * @return \service_schedule
-     */
-    public static function service_schedule() {
-        static $a = null;
+    * 停服计划
+    * @return \service_schedule
+    */
+    public static function service_schedule()
+    { 
+        static $a = null; 
         return self::initValue($a, 'service_schedule');
     }
-
     /**
-     * @return \sm_service_schedule service_schedule item数据
-     */
-    public static function service_schedule_getItem($itemid) {
+    * @return \sm_service_schedule service_schedule item数据 
+    */
+    public static function service_schedule_getItem($itemid)
+    { 
         return self::get_hash_item('service_schedule', $itemid);
     }
-
     /**
-     * 道具表
-     * @return \item
-     */
-    public static function item() {
-        static $a = null;
+    * 道具表
+    * @return \item
+    */
+    public static function item()
+    { 
+        static $a = null; 
         return self::initValue($a, 'item');
     }
-
     /**
-     * @return \sm_item item item数据
-     */
-    public static function item_getItem($itemid) {
+    * @return \sm_item item item数据 
+    */
+    public static function item_getItem($itemid)
+    { 
         return self::get_hash_item('item', $itemid);
     }
-
     /**
-     * 系统邮件
-     * @return \sysmail
-     */
-    public static function sysmail() {
-        static $a = null;
+    * 系统邮件
+    * @return \sysmail
+    */
+    public static function sysmail()
+    { 
+        static $a = null; 
         return self::initValue($a, 'sysmail');
     }
-
     /**
-     * @return \sm_sysmail sysmail item数据
-     */
-    public static function sysmail_getItem($itemid) {
+    * @return \sm_sysmail sysmail item数据 
+    */
+    public static function sysmail_getItem($itemid)
+    { 
         return self::get_hash_item('sysmail', $itemid);
     }
-
     /**
-     * 客户端版本信息
-     * @return \clientVersionHistory
-     */
-    public static function clientVersionHistory() {
-        static $a = null;
+    * 客户端版本信息
+    * @return \clientVersionHistory
+    */
+    public static function clientVersionHistory()
+    { 
+        static $a = null; 
         return self::initValue($a, 'clientVersionHistory');
     }
-
     /**
-     * @return \sm_clientVersionHistory clientVersionHistory item数据
-     */
-    public static function clientVersionHistory_getItem($itemid) {
+    * @return \sm_clientVersionHistory clientVersionHistory item数据 
+    */
+    public static function clientVersionHistory_getItem($itemid)
+    { 
         return self::get_hash_item('clientVersionHistory', $itemid);
     }
-
     /**
-     * 错误信息表
-     * @return \errmsg
-     */
-    public static function errmsg() {
-        static $a = null;
+    * 错误信息表
+    * @return \errmsg
+    */
+    public static function errmsg()
+    { 
+        static $a = null; 
         return self::initValue($a, 'errmsg');
     }
-
     /**
-     * @return \sm_errmsg errmsg item数据
-     */
-    public static function errmsg_getItem($itemid) {
+    * @return \sm_errmsg errmsg item数据 
+    */
+    public static function errmsg_getItem($itemid)
+    { 
         return self::get_hash_item('errmsg', $itemid);
     }
-
     /**
-     * 战斗: 波次表
-     * @return \waves
-     */
-    public static function waves() {
-        static $a = null;
+    * 战斗: 波次表
+    * @return \waves
+    */
+    public static function waves()
+    { 
+        static $a = null; 
         return self::initValue($a, 'waves');
     }
-
     /**
-     * @return \sm_waves waves itemArray
-     */
-    public static function waves_getItemArray($key) {
+    * @return \sm_waves waves itemArray 
+    */
+    public static function waves_getItemArray($key)
+    { 
         return self::get_hash_item('waves', $key);
     }
-   
-    /*
-     * 活动: 七日签到
-     * @return \activity_day7
-     */
-    public static function activity_day7() {
-        static $a = null;
+    /**
+    * 活动: 七日签到
+    * @return \activity_day7
+    */
+    public static function activity_day7()
+    { 
+        static $a = null; 
         return self::initValue($a, 'activity_day7');
     }
-
     /**
-     * @return \sm_activity_day7 activity_day7 item数据
-     */
-    public static function activity_day7_getItem($itemid) {
+    * @return \sm_activity_day7 activity_day7 item数据 
+    */
+    public static function activity_day7_getItem($itemid)
+    { 
         return self::get_hash_item('activity_day7', $itemid);
     }
-
     /**
-     * 章节表
-     * @return \gate
-     */
-    public static function gate() {
-        static $a = null;
+    * 章节表
+    * @return \gate
+    */
+    public static function gate()
+    { 
+        static $a = null; 
         return self::initValue($a, 'gate');
     }
-
     /**
-     * @return \sm_gate gate item数据
-     */
-    public static function gate_getItem($itemid) {
+    * @return \sm_gate gate item数据 
+    */
+    public static function gate_getItem($itemid)
+    { 
         return self::get_hash_item('gate', $itemid);
     }
-
     /**
-     * 角色
-     * @return \hero
-     */
-    public static function hero() {
-        static $a = null;
+    * 角色
+    * @return \hero
+    */
+    public static function hero()
+    { 
+        static $a = null; 
         return self::initValue($a, 'hero');
     }
-
     /**
-     * @return \sm_hero hero item数据
-     */
-    public static function hero_getItem($itemid) {
+    * @return \sm_hero hero item数据 
+    */
+    public static function hero_getItem($itemid)
+    { 
         return self::get_hash_item('hero', $itemid);
     }
-
     /**
-     * 装备表
-     * @return \equip
-     */
-    public static function equip() {
-        static $a = null;
+    * 装备表
+    * @return \equip
+    */
+    public static function equip()
+    { 
+        static $a = null; 
         return self::initValue($a, 'equip');
     }
-
     /**
-     * @return \sm_equip equip item数据
-     */
-    public static function equip_getItem($itemid) {
+    * @return \sm_equip equip item数据 
+    */
+    public static function equip_getItem($itemid)
+    { 
         return self::get_hash_item('equip', $itemid);
     }
-
     /**
-     * 装备升级表
-     * @return \equip_levelupgrade
-     */
-    public static function equip_levelupgrade() {
-        static $a = null;
+    * 装备升级表
+    * @return \equip_levelupgrade
+    */
+    public static function equip_levelupgrade()
+    { 
+        static $a = null; 
         return self::initValue($a, 'equip_levelupgrade');
     }
-
     /**
-     * @return \sm_equip_levelupgrade equip_levelupgrade item数据
-     */
-    public static function equip_levelupgrade_getItem($itemid) {
+    * @return \sm_equip_levelupgrade equip_levelupgrade item数据 
+    */
+    public static function equip_levelupgrade_getItem($itemid)
+    { 
         return self::get_hash_item('equip_levelupgrade', $itemid);
     }
-
     /**
-     * 章节礼包表
-     * @return \shop_gategift
-     */
-    public static function shop_gategift() {
-        static $a = null;
+    * 章节礼包表
+    * @return \shop_gategift
+    */
+    public static function shop_gategift()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_gategift');
     }
-
     /**
-     * @return \sm_shop_gategift shop_gategift item数据
-     */
-    public static function shop_gategift_getItem($itemid) {
+    * @return \sm_shop_gategift shop_gategift item数据 
+    */
+    public static function shop_gategift_getItem($itemid)
+    { 
         return self::get_hash_item('shop_gategift', $itemid);
     }
-
     /**
-     * 每日商店
-     * @return \shop_daily
-     */
-    public static function shop_daily() {
-        static $a = null;
+    * 每日商店
+    * @return \shop_daily
+    */
+    public static function shop_daily()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_daily');
     }
-
     /**
-     * @return \sm_shop_daily shop_daily item数据
-     */
-    public static function shop_daily_getItem($itemid) {
+    * @return \sm_shop_daily shop_daily item数据 
+    */
+    public static function shop_daily_getItem($itemid)
+    { 
         return self::get_hash_item('shop_daily', $itemid);
     }
-
     /**
-     * 钻石商店
-     * @return \shop_cash
-     */
-    public static function shop_cash() {
-        static $a = null;
+    * 钻石商店
+    * @return \shop_cash
+    */
+    public static function shop_cash()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_cash');
     }
-
     /**
-     * @return \sm_shop_cash shop_cash item数据
-     */
-    public static function shop_cash_getItem($itemid) {
+    * @return \sm_shop_cash shop_cash item数据 
+    */
+    public static function shop_cash_getItem($itemid)
+    { 
         return self::get_hash_item('shop_cash', $itemid);
     }
-
     /**
-     * 金币商店
-     * @return \shop_gold
-     */
-    public static function shop_gold() {
-        static $a = null;
+    * 金币商店
+    * @return \shop_gold
+    */
+    public static function shop_gold()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_gold');
     }
-
     /**
-     * @return \sm_shop_gold shop_gold item数据
-     */
-    public static function shop_gold_getItem($itemid) {
+    * @return \sm_shop_gold shop_gold item数据 
+    */
+    public static function shop_gold_getItem($itemid)
+    { 
         return self::get_hash_item('shop_gold', $itemid);
     }
-
     /**
-     * 商城供给表-应该是废弃了
-     * @return \shop_supply
-     */
-    public static function shop_supply() {
-        static $a = null;
+    * 商城供给表-应该是废弃了
+    * @return \shop_supply
+    */
+    public static function shop_supply()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_supply');
     }
-
     /**
-     * @return \sm_shop_supply shop_supply item数据
-     */
-    public static function shop_supply_getItem($itemid) {
+    * @return \sm_shop_supply shop_supply item数据 
+    */
+    public static function shop_supply_getItem($itemid)
+    { 
         return self::get_hash_item('shop_supply', $itemid);
     }
-
     /**
-     * 词条配置表
-     * @return \predicate
-     */
-    public static function predicate() {
-        static $a = null;
+    * 词条配置表
+    * @return \predicate
+    */
+    public static function predicate()
+    { 
+        static $a = null; 
         return self::initValue($a, 'predicate');
     }
-
     /**
-     * @return \sm_predicate predicate item数据
-     */
-    public static function predicate_getItem($itemid) {
+    * @return \sm_predicate predicate item数据 
+    */
+    public static function predicate_getItem($itemid)
+    { 
         return self::get_hash_item('predicate', $itemid);
     }
-
     /**
-     * 商城军备
-     * @return \shop_junbei
-     */
-    public static function shop_junbei() {
-        static $a = null;
+    * 商城军备
+    * @return \shop_junbei
+    */
+    public static function shop_junbei()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_junbei');
     }
-
     /**
-     * @return \sm_shop_junbei shop_junbei item数据
-     */
-    public static function shop_junbei_getItem($itemid) {
+    * @return \sm_shop_junbei shop_junbei item数据 
+    */
+    public static function shop_junbei_getItem($itemid)
+    { 
         return self::get_hash_item('shop_junbei', $itemid);
     }
-
     /**
-     * 进化表
-     * @return \evolve
-     */
-    public static function evolve() {
-        static $a = null;
+    * 进化表
+    * @return \evolve
+    */
+    public static function evolve()
+    { 
+        static $a = null; 
         return self::initValue($a, 'evolve');
     }
-
     /**
-     * @return \sm_evolve evolve item数据
-     */
-    public static function evolve_getItem($itemid) {
+    * @return \sm_evolve evolve item数据 
+    */
+    public static function evolve_getItem($itemid)
+    { 
         return self::get_hash_item('evolve', $itemid);
     }
-
     /**
-     * 7日签到累计
-     * @return \active_day7_accumulate
-     */
-    public static function active_day7_accumulate() {
-        static $a = null;
+    * 7日签到累计
+    * @return \active_day7_accumulate
+    */
+    public static function active_day7_accumulate()
+    { 
+        static $a = null; 
         return self::initValue($a, 'active_day7_accumulate');
     }
-
     /**
-     * @return \sm_active_day7_accumulate active_day7_accumulate item数据
-     */
-    public static function active_day7_accumulate_getItem($itemid) {
+    * @return \sm_active_day7_accumulate active_day7_accumulate item数据 
+    */
+    public static function active_day7_accumulate_getItem($itemid)
+    { 
         return self::get_hash_item('active_day7_accumulate', $itemid);
     }
-
     /**
-     * 宝石表
-     * @return \gem
-     */
-    public static function gem() {
-        static $a = null;
+    * 宝石表
+    * @return \gem
+    */
+    public static function gem()
+    { 
+        static $a = null; 
         return self::initValue($a, 'gem');
     }
-
     /**
-     * @return \sm_gem gem item数据
-     */
-    public static function gem_getItem($itemid) {
+    * @return \sm_gem gem item数据 
+    */
+    public static function gem_getItem($itemid)
+    { 
         return self::get_hash_item('gem', $itemid);
     }
-
     /**
-     * 秘宝表
-     * @return \gate_sbox
-     */
-    public static function gate_sbox() {
-        static $a = null;
+    * 秘宝表
+    * @return \gate_sbox
+    */
+    public static function gate_sbox()
+    { 
+        static $a = null; 
         return self::initValue($a, 'gate_sbox');
     }
-
     /**
-     * @return \sm_gate_sbox gate_sbox itemArray
-     */
-    public static function gate_sbox_getItemArray($key) {
+    * @return \sm_gate_sbox gate_sbox itemArray 
+    */
+    public static function gate_sbox_getItemArray($key)
+    { 
         return self::get_hash_item('gate_sbox', $key);
     }
-
     /**
-     * 最新的成就
-     * @return \achieve_new
-     */
-    public static function achieve_new() {
-        static $a = null;
+    * 最新的成就
+    * @return \achieve_new
+    */
+    public static function achieve_new()
+    { 
+        static $a = null; 
         return self::initValue($a, 'achieve_new');
     }
-
     /**
-     * @return \sm_achieve_new achieve_new item数据
-     */
-    public static function achieve_new_getItem($itemid) {
+    * @return \sm_achieve_new achieve_new item数据 
+    */
+    public static function achieve_new_getItem($itemid)
+    { 
         return self::get_hash_item('achieve_new', $itemid);
     }
-
     /**
-     * 人物属性
-     * @return \heroattr
-     */
-    public static function heroattr() {
-        static $a = null;
+    * 人物属性
+    * @return \heroattr
+    */
+    public static function heroattr()
+    { 
+        static $a = null; 
         return self::initValue($a, 'heroattr');
     }
-
     /**
-     * @return \sm_heroattr heroattr item数据
-     */
-    public static function heroattr_getItem($itemid) {
+    * @return \sm_heroattr heroattr item数据 
+    */
+    public static function heroattr_getItem($itemid)
+    { 
         return self::get_hash_item('heroattr', $itemid);
     }
-
     /**
-     * 剧情对话
-     * @return \plots
-     */
-    public static function plots() {
-        static $a = null;
+    * 剧情对话
+    * @return \plots
+    */
+    public static function plots()
+    { 
+        static $a = null; 
         return self::initValue($a, 'plots');
     }
-
     /**
-     * @return \sm_plots plots item数据
-     */
-    public static function plots_getItem($itemid) {
+    * @return \sm_plots plots item数据 
+    */
+    public static function plots_getItem($itemid)
+    { 
         return self::get_hash_item('plots', $itemid);
     }
-
     /**
-     * 商城宝箱表
-     * @return \shop_box
-     */
-    public static function shop_box() {
-        static $a = null;
+    * 商城宝箱表
+    * @return \shop_box
+    */
+    public static function shop_box()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_box');
     }
-
     /**
-     * @return \sm_shop_box shop_box item数据
-     */
-    public static function shop_box_getItem($itemid) {
+    * @return \sm_shop_box shop_box item数据 
+    */
+    public static function shop_box_getItem($itemid)
+    { 
         return self::get_hash_item('shop_box', $itemid);
     }
-
     /**
-     * 商城月卡
-     * @return \shop_monthcard
-     */
-    public static function shop_monthcard() {
-        static $a = null;
+    * 商城月卡
+    * @return \shop_monthcard
+    */
+    public static function shop_monthcard()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_monthcard');
     }
-
     /**
-     * @return \sm_shop_monthcard shop_monthcard item数据
-     */
-    public static function shop_monthcard_getItem($itemid) {
+    * @return \sm_shop_monthcard shop_monthcard item数据 
+    */
+    public static function shop_monthcard_getItem($itemid)
+    { 
         return self::get_hash_item('shop_monthcard', $itemid);
     }
-
     /**
-     * 7日狂欢活跃点奖励
-     * @return \activepointreward
-     */
-    public static function activepointreward() {
-        static $a = null;
+    * 7日狂欢活跃点奖励
+    * @return \activepointreward
+    */
+    public static function activepointreward()
+    { 
+        static $a = null; 
         return self::initValue($a, 'activepointreward');
     }
-
     /**
-     * @return \sm_activepointreward activepointreward item数据
-     */
-    public static function activepointreward_getItem($type, $pointId) {
+    * @return \sm_activepointreward activepointreward item数据 
+    */
+    public static function activepointreward_getItem($type, $pointId)
+    { 
         return self::get_hash_item('activepointreward', "$type-$pointId");
     }
-
     /**
-     * 活动任务
-     * @return \activeTask
-     */
-    public static function activeTask() {
-        static $a = null;
+    * 活动任务
+    * @return \activeTask
+    */
+    public static function activeTask()
+    { 
+        static $a = null; 
         return self::initValue($a, 'activeTask');
     }
-
     /**
-     * @return \sm_activeTask activeTask item数据
-     */
-    public static function activeTask_getItem($itemid) {
+    * @return \sm_activeTask activeTask item数据 
+    */
+    public static function activeTask_getItem($itemid)
+    { 
         return self::get_hash_item('activeTask', $itemid);
     }
-
     /**
-     * 活动任务根据类型的不同分开
-     * @return \activeTask_type
-     */
-    public static function activeTask_type() {
-        static $a = null;
+    * 活动任务根据类型的不同分开
+    * @return \activeTask_type
+    */
+    public static function activeTask_type()
+    { 
+        static $a = null; 
         return self::initValue($a, 'activeTask_type');
     }
-
     /**
-     * @return \sm_activeTask_type activeTask_type itemArray
-     */
-    public static function activeTask_type_getItemArray($key) {
+    * @return \sm_activeTask_type activeTask_type itemArray 
+    */
+    public static function activeTask_type_getItemArray($key)
+    { 
         return self::get_hash_item('activeTask_type', $key);
     }
-
     /**
-     * 活动
-     * @return \activity
-     */
-    public static function activity() {
-        static $a = null;
+    * 活动
+    * @return \activity
+    */
+    public static function activity()
+    { 
+        static $a = null; 
         return self::initValue($a, 'activity');
     }
-
     /**
-     * @return \sm_activity activity item数据
-     */
-    public static function activity_getItem($itemid) {
+    * @return \sm_activity activity item数据 
+    */
+    public static function activity_getItem($itemid)
+    { 
         return self::get_hash_item('activity', $itemid);
     }
-
     /**
-     * 公告
-     * @return \announcement
-     */
-    public static function announcement() {
-        static $a = null;
+    * 公告
+    * @return \announcement
+    */
+    public static function announcement()
+    { 
+        static $a = null; 
         return self::initValue($a, 'announcement');
     }
-
     /**
-     * @return \sm_announcement announcement item数据
-     */
-    public static function announcement_getItem($itemid) {
+    * @return \sm_announcement announcement item数据 
+    */
+    public static function announcement_getItem($itemid)
+    { 
         return self::get_hash_item('announcement', $itemid);
     }
-
     /**
-     * 当前版本(时间戳)
-     * @return \ver
-     */
-    public static function ver() {
-        static $a = null;
+    * 当前版本(时间戳)
+    * @return \ver
+    */
+    public static function ver()
+    { 
+        static $a = null; 
         return self::initValue($a, 'ver', false);
     }
-
     /**
-     * 客户端配置数据
-     * @return \client
-     */
-    public static function client() {
-        static $a = null;
+    * 客户端配置数据
+    * @return \client
+    */
+    public static function client()
+    { 
+        static $a = null; 
         return self::initValue($a, 'client', false);
     }
 }
+

+ 29 - 26
Gameserver/App/model/Const/sm_activeTask.php

@@ -1,5 +1,4 @@
 <?php
-
 ////////////////////
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
@@ -7,73 +6,77 @@
  // 日期: 2024-05-22 14:46:41
 ////////////////////
 
+
 /**
  * Static Model activeTask 活动任务
  */
-class sm_activeTask {
+class sm_activeTask
+{
 
     /**
-     * @var Int32 索引 default(0)
-     */
+    * @var Int32 索引 default(0) 
+    */
     public $id;
 
     /**
-     * @var String 名称
-     */
+    * @var String 名称  
+    */
     public $name;
 
     /**
-     * @var Int32 天 default(0)
-     */
+    * @var Int32 天 default(0) 
+    */
     public $day;
 
     /**
-     * @var Int32 解锁内容类型 1: 7日狂欢 2 日常 3周常 default(0)
-     */
+    * @var Int32 解锁内容类型 1: 7日狂欢 2 日常 3周常 default(0) 
+    */
     public $type;
 
     /**
-     * @var Int32 事件件码指令(详见文档) default(0)
-     */
+    * @var Int32 事件件码指令(详见文档) default(0) 
+    */
     public $cmd;
 
     /**
-     * @var String 参数 (若参数为多个,需要自己跟策划约定好解析规则)这里面都是用的==判断
-     */
+    * @var String 参数 (若参数为多个,需要自己跟策划约定好解析规则)这里面都是用的==判断  
+    */
     public $paras;
 
     /**
-     * @var Int32 条件计数 (max)(>=max) default(1)
-     */
+    * @var Int32 条件计数 (max)(>=max) default(1) 
+    */
     public $num;
 
     /**
-     * @var String 解锁内容 1技能 2英雄 3地图 4装备 5金币
-     */
+    * @var String 解锁内容 1技能 2英雄 3地图 4装备 5金币  
+    */
     public $prizes;
 
     /**
-     * @var String 描述
-     */
+    * @var String 描述  
+    */
     public $des;
 
     /**
-     * @var String 图标
-     */
+    * @var String 图标  
+    */
     public $icon;
 
     /**
-     * @var String 其他
-     */
+    * @var String 其他  
+    */
     public $etc;
 
     /**
-     * @var String 活跃点
-     */
+    * @var String 活跃点  
+    */
     public $activePoint;
 
     /**
     * @var Int32 前往类型 default(0) 
     */
     public $gotoType;
+
 }
+

+ 28 - 26
Gameserver/App/model/Const/sm_activeTask_type.php

@@ -1,5 +1,4 @@
 <?php
-
 ////////////////////
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
@@ -7,69 +6,71 @@
  // 日期: 2024-05-22 14:46:41
 ////////////////////
 
+
 /**
  * Static Model activeTask_type 活动任务根据类型的不同分开
  */
-class sm_activeTask_type {
+class sm_activeTask_type
+{
 
     /**
-     * @var Int32 索引 default(0)
-     */
+    * @var Int32 索引 default(0) 
+    */
     public $id;
 
     /**
-     * @var String 名称
-     */
+    * @var String 名称  
+    */
     public $name;
 
     /**
-     * @var Int32 天 default(0)
-     */
+    * @var Int32 天 default(0) 
+    */
     public $day;
 
     /**
-     * @var Int32 解锁内容类型 1: 7日狂欢 2 日常 3周常 default(0)
-     */
+    * @var Int32 解锁内容类型 1: 7日狂欢 2 日常 3周常 default(0) 
+    */
     public $type;
 
     /**
-     * @var Int32 事件件码指令(详见文档) default(0)
-     */
+    * @var Int32 事件件码指令(详见文档) default(0) 
+    */
     public $cmd;
 
     /**
-     * @var String 参数 (若参数为多个,需要自己跟策划约定好解析规则)这里面都是用的==判断
-     */
+    * @var String 参数 (若参数为多个,需要自己跟策划约定好解析规则)这里面都是用的==判断  
+    */
     public $paras;
 
     /**
-     * @var Int32 条件计数 (max)(>=max) default(1)
-     */
+    * @var Int32 条件计数 (max)(>=max) default(1) 
+    */
     public $num;
 
     /**
-     * @var String 解锁内容 1技能 2英雄 3地图 4装备 5金币
-     */
+    * @var String 解锁内容 1技能 2英雄 3地图 4装备 5金币  
+    */
     public $prizes;
 
     /**
-     * @var String 描述
-     */
+    * @var String 描述  
+    */
     public $des;
 
     /**
-     * @var String 图标
-     */
+    * @var String 图标  
+    */
     public $icon;
 
     /**
-     * @var String 其他
-     */
+    * @var String 其他  
+    */
     public $etc;
 
     /**
-     * @var String 活跃点
-     */
+    * @var String 活跃点  
+    */
     public $activePoint;
 
     /**
@@ -78,3 +79,4 @@ class sm_activeTask_type {
     public $gotoType;
 
 }
+

+ 5 - 0
Gameserver/App/model/Const/sm_gate.php

@@ -21,6 +21,11 @@ class sm_gate
     */
     public $gateId;
 
+    /**
+    * @var Int32 关卡序号  
+    */
+    public $gateNum;
+
     /**
     * @var String 名称  
     */

+ 1 - 1
Gameserver/App/model/Const/sm_globalsettings.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-05-22 09:13:17
+ // 日期: 2024-05-22 15:51:42
 ////////////////////
 
 

+ 19 - 16
Gameserver/App/model/Const/sm_item.php

@@ -1,5 +1,4 @@
 <?php
-
 ////////////////////
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
@@ -7,43 +6,47 @@
  // 日期: 2024-05-22 09:33:18
 ////////////////////
 
+
 /**
  * Static Model item 道具表
  */
-class sm_item {
+class sm_item
+{
 
     /**
-     * @var Int32 查询用的ID
-     */
+    * @var Int32 查询用的ID  
+    */
     public $typeId;
 
     /**
-     * @var String 物品名称 default(物品名称)
-     */
+    * @var String 物品名称 default(物品名称) 
+    */
     public $name;
 
     /**
-     * @var String 物品icon名
-     */
+    * @var String 物品icon名  
+    */
     public $icon;
 
     /**
-     * @var String 物品描述 default(物品描述)
-     */
+    * @var String 物品描述 default(物品描述) 
+    */
     public $desc;
 
     /**
-     * @var Int32 物品归类 100:图纸; 701:关卡礼包里的图纸随机礼盒 default(0)
-     */
+    * @var Int32 物品归类 100:图纸; 701:关卡礼包里的图纸随机礼盒 default(0) 
+    */
     public $itemType;
 
     /**
-     * @var Int32 道具可叠加展示的数量上限, 0 代表不可叠加 default(0)
-     */
+    * @var Int32 道具可叠加展示的数量上限, 0 代表不可叠加 default(0) 
+    */
     public $pileNum;
 
     /**
-     * @var Int32 品质/稀有度 1白2绿3蓝 default(1)
-     */
+    * @var Int32 品质/稀有度 1白2绿3蓝 default(1) 
+    */
     public $quality;
+
 }
+

+ 1 - 1
Gameserver/App/model/Const/sm_waves.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-05-21 15:13:17
+ // 日期: 2024-05-22 15:34:58
 ////////////////////
 
 

+ 1 - 44
Gameserver/App/process/ActiveProc.php

@@ -23,55 +23,12 @@ class ActiveProc {
         switch ($req->cmd) {
             case CmdCode::active_day7_drawreward:                               # 6101 签到
                 return ActiveProc::Day7_DrawReward();        
-            case CmdCode::active_day7_accumulateDrawreward:                     # 6102 7日累充
-                return ActiveProc::Day7__accumulateDrawreward();        
-                
+                                    
             default:
                 Err(ErrCode::cmd_err);
         }
     }
     
-    /**
-     * 7日累充领奖
-     */
-    public static function Day7__accumulateDrawreward() {
-        list($type,$typeId) = req()->paras;                                     # 参数: 领取第x天的奖励
-        $user = ctx();
-       
-        if($type == Enum_TaskType::Day7_Sign){
-            my_Assert($user->privateState->day7_accumulate >= $typeId, ErrCode::active_day7_expired);
-            my_Assert(!in_array($typeId, $user->privateState->day7_accumulateDrawed), ErrCode::active_hasgetted);
-            $day_rwd = GameConfig::active_day7_accumulate_getItem($typeId);                     # 查询奖励数据
-            my_Assert(null != $day_rwd, ErrCode::err_const_no);                     # 防御找不到配置
-            StoreProc::AddMultiItemInStore($day_rwd->reward);                       # 发放奖励
-            $user->privateState->day7_accumulateDrawed[] = $typeId;
-            
-            
-        } elseif (Enum_TaskType::DailyTask) {
-            my_Assert($user->task->dailyTaskAccumulate >= $typeId, ErrCode::active_day7_expired);
-            my_Assert(!in_array($typeId, $user->task->dailyTaskAccumulateDrawed), ErrCode::active_hasgetted);
-            $day_rwd = GameConfig::task_accumulate_daily_getItem($typeId);                     # 查询奖励数据
-            my_Assert(null != $day_rwd, ErrCode::err_const_no);                     # 防御找不到配置
-            StoreProc::AddMultiItemInStore($day_rwd->reward);                       # 发放奖励
-            $user->task->dailyTaskAccumulateDrawed[] = $typeId;
-        } elseif (Enum_TaskType::WeekTask) {
-            my_Assert($user->task->weekTaskAccumulate >= $typeId, ErrCode::active_day7_expired);
-            my_Assert(!in_array($typeId, $user->task->weekTaskAccumulateDrawed), ErrCode::active_hasgetted);
-            $day_rwd = GameConfig::task_accumulate_week_getItem($typeId);                     # 查询奖励数据
-            my_Assert(null != $day_rwd, ErrCode::err_const_no);                     # 防御找不到配置
-            StoreProc::AddMultiItemInStore($day_rwd->reward);                       # 发放奖励
-            $user->task->weekTaskAccumulateDrawed[] = $typeId;
-        }
-                                      
-        ctx($user);
-        UserProc::updateUserInfo();                                             # 回存
-        return Resp::ok(array(
-                    'gold' => $user->baseInfo->gold,
-                    'cash' => $user->baseInfo->cash,
-                    'tili' => $user->baseInfo->tili,
-                    'store' => $user->store,                  
-        ));  
-    }
     
     /**
      * 7日签到 数据更新

+ 1 - 0
Gameserver/App/process/FightProc.php

@@ -521,6 +521,7 @@ class FightProc {
         if ($resultType) {                                                      # 胜利
             if (ctx()->gates->GateList->$gateId->pass == 0) {
                 ctx()->gates->GateList->$gateId->pass = 1;
+                TaskProc::Day7TaskReset($gateId);
             }
             StoreProc::AddMultiItemInStore($gateMo->reward_win);
             if (Ins_GateInfo::GateTypeFromId($gateId) == Enum_GateType::MainStoryGate) {

+ 0 - 39
Gameserver/App/process/TaskProc.php

@@ -233,45 +233,6 @@ class TaskProc {
         ));
     }
 
-    /**
-     * 领取任务奖励
-     * @return type
-     */
-    public static function ReceiveTaskReward() {
-        list($type, $uid) = req()->paras; //uid
-
-        my_Assert(StlUtil::dictHasProperty(ctx()->task->taskcards, $uid), ErrCode::task_NoExist);
-        $task = ctx()->task->taskcards->$uid;
-        $mo = GameConfig::taskcard_getItem($task->taskId);
-        my_Assert($mo != null, ErrCode::err_const_no);
-
-        $taskstepsMo = GameConfig::task_step_getItem($mo->tasksteps);
-        my_Assert($taskstepsMo != null, ErrCode::err_const_no);
-
-        $taskStep = $task->curSteps;
-        my_Assert($taskStep->cur >= $taskstepsMo->num, ErrCode::task_CanotPriceReviced);
-        my_Assert($task->state == Enum_TaskCardStateType::finish, ErrCode::task_CanotPriceReviced);
-
-        switch ($type) {
-            case Enum_TaskType::DailyTask:
-                ctx()->task->dailyTaskAccumulate += $mo->score;
-                break;
-            case Enum_TaskType::WeekTask:
-                ctx()->task->weekTaskAccumulate += $mo->score;
-                break;
-            default:
-                break;
-        }
-        $task->state = Enum_TaskCardStateType::drawed;
-        ctx()->task->taskcards->$uid = $task;
-
-        StoreProc::AddMultiItemInStore($mo->reward);
-
-        return Resp::ok(array("task" => ctx()->task,
-                    "store" => ctx()->store,
-        ));
-    }
-
     static function ResetTask() {
         //self::ResetTask_Daily();
         self::DailyTaskReset();