配置

DevOps/flscfg/settings.json

@@ -32,8 +32,8 @@
   "Gen_Lua": true,
   "Gen_Bytes": true,
   "Gen_Json": false,
-  "PHP_OutDir": "D:\\local_svn\\0_ylsj2019\\jzhj2023server\\Gameserver\\App\\model\\Const",
-  "Cs_OutDir": "D:\\local_svn\\0_ylsj2019\\jzhj2023_hot\\Assets\\__Scripts\\Server\\Proxy\\ConstMo_Auto",
+  "PHP_OutDir": "F:\\jiuzhou\\jzhj2023server\\Gameserver\\App\\model\\Const",
+  "Cs_OutDir": "G:\\jiuzhouClient\\Assets\\__Scripts\\Server\\Proxy\\ConstMo_Auto",
   "Lua_OutDir": "",
   "Json_OutDir": null,
   "Bytes_OutDir": null,

Gameserver/App/base/ErrCode.php

@@ -403,6 +403,20 @@ class ErrCode {
 // </editor-fold>
 //    
     
+//   // <editor-fold defaultstate="collapsed" desc="    task 3600    ">    
+
+    /**
+     * 任务不存在
+     */
+    const task_NoExist = 3601;
+    
+    const task_CanotPriceReviced= 3602;
+    
+    const task_PriceRepeatReviced= 3603;
+    
+// </editor-fold>
+//  
+    
     
 
 // <editor-fold defaultstate="collapsed" desc="    反射方法    ">

Gameserver/App/configs/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2023-09-19 17:03:23
+ // 日期: 2023-09-22 15:32:03
 ////////////////////
 
 namespace loyalsoft;
@@ -559,22 +559,6 @@ class GameConfig {
         return self::get_hash_item('buff', $itemid);
     }
     /**
-    * 每日任务累计表
-    * @return \task_accumulate
-    */
-    public static function task_accumulate()
-    { 
-        static $a = null; 
-        return self::initValue($a, 'task_accumulate');
-    }
-    /**
-    * @return \sm_task_accumulate task_accumulate item数据 
-    */
-    public static function task_accumulate_getItem($itemid)
-    { 
-        return self::get_hash_item('task_accumulate', $itemid);
-    }
-    /**
     * 任务表
     * @return \task_step
     */
@@ -607,6 +591,54 @@ class GameConfig {
         return self::get_hash_item('taskcard', $itemid);
     }
     /**
+    * 怪物技能表
+    * @return \monster_Skill
+    */
+    public static function monster_Skill()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'monster_Skill');
+    }
+    /**
+    * @return \sm_monster_Skill monster_Skill item数据 
+    */
+    public static function monster_Skill_getItem($itemid)
+    { 
+        return self::get_hash_item('monster_Skill', $itemid);
+    }
+    /**
+    * 每日任务累计
+    * @return \task_accumulate_daily
+    */
+    public static function task_accumulate_daily()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'task_accumulate_daily');
+    }
+    /**
+    * @return \sm_task_accumulate_daily task_accumulate_daily item数据 
+    */
+    public static function task_accumulate_daily_getItem($itemid)
+    { 
+        return self::get_hash_item('task_accumulate_daily', $itemid);
+    }
+    /**
+    * 周常任务累计
+    * @return \task_accumulate_week
+    */
+    public static function task_accumulate_week()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'task_accumulate_week');
+    }
+    /**
+    * @return \sm_task_accumulate_week task_accumulate_week item数据 
+    */
+    public static function task_accumulate_week_getItem($itemid)
+    { 
+        return self::get_hash_item('task_accumulate_week', $itemid);
+    }
+    /**
     * 当前版本(时间戳)
     * @return \ver
     */

Gameserver/App/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2023-09-21 15:59:26
+ // 日期: 2023-09-22 15:32:03
 ////////////////////
 
 /**
@@ -557,22 +557,6 @@ class GameConfig {
         return self::get_hash_item('buff', $itemid);
     }
     /**
-    * 每日任务累计表
-    * @return \task_accumulate
-    */
-    public static function task_accumulate()
-    { 
-        static $a = null; 
-        return self::initValue($a, 'task_accumulate');
-    }
-    /**
-    * @return \sm_task_accumulate task_accumulate item数据 
-    */
-    public static function task_accumulate_getItem($itemid)
-    { 
-        return self::get_hash_item('task_accumulate', $itemid);
-    }
-    /**
     * 任务表
     * @return \task_step
     */
@@ -621,6 +605,38 @@ class GameConfig {
         return self::get_hash_item('monster_Skill', $itemid);
     }
     /**
+    * 每日任务累计
+    * @return \task_accumulate_daily
+    */
+    public static function task_accumulate_daily()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'task_accumulate_daily');
+    }
+    /**
+    * @return \sm_task_accumulate_daily task_accumulate_daily item数据 
+    */
+    public static function task_accumulate_daily_getItem($itemid)
+    { 
+        return self::get_hash_item('task_accumulate_daily', $itemid);
+    }
+    /**
+    * 周常任务累计
+    * @return \task_accumulate_week
+    */
+    public static function task_accumulate_week()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'task_accumulate_week');
+    }
+    /**
+    * @return \sm_task_accumulate_week task_accumulate_week item数据 
+    */
+    public static function task_accumulate_week_getItem($itemid)
+    { 
+        return self::get_hash_item('task_accumulate_week', $itemid);
+    }
+    /**
     * 当前版本(时间戳)
     * @return \ver
     */

Gameserver/App/model/Const/sm_gate.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2023-09-21 16:02:54
+ // 日期: 2023-09-22 14:25:37
 ////////////////////
 
 
@@ -19,7 +19,9 @@ class sm_gate
     public $id;
 
     /**
-    * @var Int32 关卡id  
+    * @var Int32 关卡id: 
+    *  命名规律:关卡类型（1主线2主线挑战）+关卡序号（最大999）+关卡风格（编号待定）+关卡类型（0四方连续1上下连续2固定）+关卡难度（1普通2困难3噩梦）
+    *  例如：10010101,20010111  
     */
     public $gateId;
 
@@ -28,11 +30,6 @@ class sm_gate
     */
     public $gateName;
 
-    /**
-    * @var Int32 关卡类型  
-    */
-    public $type;
-
     /**
     * @var Int32 所属于某个章节的章节Id  
     */
@@ -108,16 +105,6 @@ class sm_gate
     */
     public $isOpenMap;
 
-    /**
-    * @var Int32 地图编号:  default(1) 
-    */
-    public $mapId;
-
-    /**
-    * @var Int32 地图类型: 0 四周开放, 1 上下开放, 2 有限区域 default(0) 
-    */
-    public $mapType;
-
     /**
     * @var String 用途未知！！请到数据库中添加字段注释。  
     */

Gameserver/App/model/Const/sm_monster_Skill.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2023-09-21 15:12:06
+ // 日期: 2023-09-22 15:17:52
 ////////////////////
 
 
@@ -19,7 +19,7 @@ class sm_monster_Skill
     public $skillId;
 
     /**
-    * @var Int32 类型：1:弹幕类；2: 碰撞检测类；3:设置陷阱类 default(0) 
+    * @var Int32 1:弹幕类；2: 冲锋 3: 跃击 4:钻地   9:设置陷阱类 default(0) 
     */
     public $skillType;
 
@@ -28,6 +28,11 @@ class sm_monster_Skill
     */
     public $atkRate;
 
+    /**
+    * @var Int32 子弹资源id default(0) 
+    */
+    public $bullet_res;
+
     /**
     * @var Int32 子弹数量  
     */
@@ -78,15 +83,25 @@ class sm_monster_Skill
     */
     public $bullet_destructible;
 
+    /**
+    * @var Int32 子弹伤害次数(0,无限,具体值则按数量执行)  
+    */
+    public $bullet_damageTimes;
+
     /**
     * @var Single 击退距离% default(0) 
     */
     public $repulse_distance;
 
     /**
-    * @var Int32 子弹伤害次数(0,无限,具体值则按数量执行)  
+    * @var Int32 技能发射波次: 默认1 default(1) 
     */
-    public $bullet_damageTimes;
+    public $waves;
+
+    /**
+    * @var Single 技能发射波次间隔: 默认0 default(0) 
+    */
+    public $waveInterval;
 
     /**
     * @var Int32 0默认值

Gameserver/App/model/Const/sm_task_accumulate_daily.php

@@ -0,0 +1,32 @@
+<?php
+////////////////////
+ // 由CodeGenerator创建。
+ // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
+ // author： gwang 
+ // 日期: 2023-09-15 16:47:42
+////////////////////
+
+
+/**
+ * Static Model task_accumulate_daily 每日任务累计
+ */
+class sm_task_accumulate_daily
+{
+
+    /**
+    * @var Int32 用途未知！！请到数据库中添加字段注释。  
+    */
+    public $id;
+
+    /**
+    * @var Int32 用途未知！！请到数据库中添加字段注释。  
+    */
+    public $typeId;
+
+    /**
+    * @var String 用途未知！！请到数据库中添加字段注释。  
+    */
+    public $reward;
+
+}
+

Gameserver/App/model/Const/sm_task_accumulate_week.php

@@ -0,0 +1,32 @@
+<?php
+////////////////////
+ // 由CodeGenerator创建。
+ // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
+ // author： gwang 
+ // 日期: 2023-09-22 15:25:58
+////////////////////
+
+
+/**
+ * Static Model task_accumulate_week 周常任务累计
+ */
+class sm_task_accumulate_week
+{
+
+    /**
+    * @var Int32 用途未知！！请到数据库中添加字段注释。  
+    */
+    public $id;
+
+    /**
+    * @var Int32 用途未知！！请到数据库中添加字段注释。  
+    */
+    public $typeId;
+
+    /**
+    * @var String 用途未知！！请到数据库中添加字段注释。  
+    */
+    public $reward;
+
+}
+

Gameserver/App/model/Const/sm_taskcard.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2023-09-20 11:31:32
+ // 日期: 2023-09-22 15:25:41
 ////////////////////
 
 
@@ -64,5 +64,10 @@ class sm_taskcard
     */
     public $score;
 
+    /**
+    * @var String 奖励  
+    */
+    public $reward;
+
 }
 

Gameserver/App/model/User/Enum_TaskCardStateType.php

@@ -37,14 +37,19 @@ class Enum_TaskCardStateType {
 
 class Enum_TaskType {
 
+    /**
+     * 
+     */
+    const Day7_Sign = 1;
+    
     /**
      * 日常任务
      */
-    const DailyTask = 1;
+    const DailyTask = 2;
 
     /**
      * 周常任务
      */
-    const WeekTask = 2;
+    const WeekTask = 3;
 
 }

Gameserver/App/model/User/Info_Task.php

@@ -32,13 +32,26 @@ class Info_Task extends Object_ext{
      */
     public $dailyTaskAccumulate = 0;
     
+    /**
+     * 
+     * @var type
+     */
+    #[ArrayType]
+    public $dailyTaskAccumulateDrawed = array();
+    
     /**
      * 周常任务累计值
      * @var type
      */
     public $weekTaskAccumulate = 0;
 
-
+    /**
+     * 
+     * @var type
+     */
+    #[ArrayType]
+    public $weekTaskAccumulateDrawed = array();
+    
     public function initialize() {
       $this->taskcards = new \stdClass();
     }

Gameserver/App/process/ActiveProc.php

@@ -35,16 +35,34 @@ class ActiveProc {
      * 7日累充领奖
      */
     public static function Day7__accumulateDrawreward() {
-        list($typeId) = req()->paras;                                              # 参数: 领取第x天的奖励
+        list($type,$typeId) = req()->paras;                                     # 参数: 领取第x天的奖励
         $user = ctx();
        
-        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;
-           
+        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(

Gameserver/App/process/TaskProc.php

@@ -41,10 +41,20 @@ class TaskProc {
      * @return type
      */
     public static function ReceiveTaskReward() {
-        list($type,$taskId) = req()->paras;//武器uid
-        
-        $mo = GameConfig::taskcard_getItem($taskId);
+        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;
@@ -55,6 +65,10 @@ class TaskProc {
             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,