Merge branch 'dev' of http://192.168.10.18:3000/YLSJTeam/YLSJServer into dev

Gameserver/Amfphp/model/User/Enum_TaskCmdType.php

@@ -8,12 +8,12 @@ namespace loyalsoft;
 class Enum_TaskCmdType extends Enum {
 
     const CommanderLevelUpTo = 11;                                              # 玩家等级达到x级  (num:level,paras:[]) (跳关卡选择)
-    const HeroLevelUpTo = 12;                                                   # 唤灵师等级达到x级(num:level,paras:[heroid])(hero属性)
+    const HeroLevelUpTo = 12;                                                   # 唤灵师等级达到x级(num:level,paras:[herotypeid])(hero属性)
     const HeroGradeUpTo = 13;                                                   # 
     const HeroSegmentNumberTo = 14;                                             # 
     const HeroSkillUnlock = 15;                                                 # 
-    const HeroWearupWeapon_quality = 16;                                        # 唤灵师装备X品质的武器(num:1,paras:[heroId,quality])(装备界面)
-    const HeroWearupYanling = 17;                                               # 唤灵师装备xx(id)言灵 (num:1,paras:[heroId,yanlingid])(言灵配置界面)
+    const HeroWearupWeapon_quality = 16;                                        # 唤灵师装备X品质的武器(num:1,paras:[herotypeId,quality])(装备界面)
+    const HeroWearupYanling = 17;                                               # 唤灵师装备xx(id)言灵 (num:1,paras:[herotypeId,yanlingid])(言灵配置界面)
     // -----
     const PassGateN = 21;                                                       # 通过指定剧情关卡(num:1,paras:[关卡id,难度(1,2,3)])(跳关卡选择)
     const passCarbonN = 22;                                                     # 

Gameserver/Amfphp/model/User/Ins_TaskStep.php

@@ -109,7 +109,9 @@ class Ins_TaskStep extends Object_ext {
      * @param type $cmd
      */
     function isStatusType() {
-        return $this->mo()->cmd == Enum_TaskCmdType::GainItem;
+        return $this->mo()->cmd == Enum_TaskCmdType::GainItem                   # 获取道具
+                || $this->mo()->cmd == Enum_TaskCmdType::HeroLevelUpTo          # 提升玩家等级到x
+                || $this->mo()->cmd == Enum_TaskCmdType::CommanderLevelUpTo;
     }
 
     /**
@@ -159,6 +161,15 @@ class Ins_TaskStep extends Object_ext {
             case Enum_TaskCmdType::GainItem:                                    # 收集道具
                 $store = new Info_Store(req()->userInfo->game->store);
                 return $store->GetItemCount($para0);
+            case Enum_TaskCmdType::CommanderLevelUpTo:
+                $lvl = req()->userInfo->game->baseInfo->level;
+                return $lvl;
+            case Enum_TaskCmdType::HeroLevelUpTo:
+                $hero = req()->userInfo->game->heros->GetHeroByMoID($para0);
+                if (null != $hero) {
+                    return $hero->level;
+                }
+                break;
         }
         return 0;
     }

Gameserver/Amfphp/process/EventProc/NormalEventProc.php

@@ -65,6 +65,7 @@ class NormalEventProc {
      * @param type $arg2
      */
     public static function OnTaskCardStep_Complete($arg1, $arg2) {
+
         Resp::AddEvent(Enum_EventType::MissionStepComplete, $arg1, $arg2);
     }
 

Gameserver/nbproject/private/private.xml

@@ -12,20 +12,25 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/FightProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/StoreProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/config.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/Resp.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/configs/GameConfig.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/Const/GameConfig.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/util/DebugHelper.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/ErrCode.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/EventProc/NormalEventProc.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/TaskProc.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/EventProc.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Info_Map.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/FightProc/SweepGatesProc.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskCard.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/main.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskStep.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Enum_EventActionType.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/test.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/Services/AppServer.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Info_PrivateState.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/HeroProc.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/CmdCode.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Info_UserGameHero.php</file>
         </group>
     </open-files>
 </project-private>