修复冲突

Gameserver/App/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-19 16:07:26
+ // 日期: 2024-09-25 09:59:12
 ////////////////////
 
 /**

Gameserver/App/model/Const/sm_activeTask.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-18 17:26:34
+ // 日期: 2024-09-24 16:08:23
 ////////////////////
 
 

Gameserver/App/model/Const/sm_activeTask_type.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-18 17:26:34
+ // 日期: 2024-09-24 16:08:23
 ////////////////////
 
 

Gameserver/App/model/Const/sm_activity.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-11 14:57:43
+ // 日期: 2024-09-20 15:50:58
 ////////////////////
 
 
@@ -14,7 +14,7 @@ class sm_activity
 {
 
     /**
-    * @var Int32 用途未知！！请到数据库中添加字段注释。  
+    * @var Int32 用途未知！！请到数据库中添加字段注释。 default(0) 
     */
     public $id;
 

Gameserver/App/model/Const/sm_activity_day7.php

@@ -32,7 +32,7 @@ class sm_activity_day7
     * @var String 奖励:itemId,num 高级签到奖励  
     */
     public $reward_high;
-    
+
     /**
     * @var String 备注  
     */

Gameserver/App/model/Const/sm_equip_levelupgrade.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-06-21 18:13:18
+ // 日期: 2024-09-20 09:32:38
 ////////////////////
 
 

Gameserver/App/model/Const/sm_fun_unlock.php

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

Gameserver/App/model/Const/sm_gate.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-19 16:06:33
+ // 日期: 2024-09-24 09:20:53
 ////////////////////
 
 

Gameserver/App/model/Const/sm_gate_unlock.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-19 16:06:33
+ // 日期: 2024-09-24 09:20:53
 ////////////////////
 
 

Gameserver/App/model/Const/sm_globalsettings.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-18 17:35:51
+ // 日期: 2024-09-25 09:38:13
 ////////////////////
 
 
@@ -303,5 +303,10 @@ class sm_globalsettings
     */
     public $activity_lottery_allNum;
 
+    /**
+    * @var Int32 妖雾重现关卡id  
+    */
+    public $TowerGateId;
+
 }
 

Gameserver/App/model/Const/sm_hero.php

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

Gameserver/App/model/Const/sm_heroType_typeId.php

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

Gameserver/App/model/Const/sm_player_level.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-12 10:44:29
+ // 日期: 2024-09-20 14:35:51
 ////////////////////
 
 

Gameserver/App/model/Const/sm_predicate.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-19 11:28:15
+ // 日期: 2024-09-20 10:59:24
 ////////////////////
 
 

Gameserver/App/model/Const/sm_shop.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-11 14:07:25
+ // 日期: 2024-09-24 17:01:17
 ////////////////////
 
 

Gameserver/App/model/Const/sm_skills.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-19 15:01:57
+ // 日期: 2024-09-24 18:05:51
 ////////////////////
 
 

Gameserver/App/model/Const/sm_subfun_unlock.php

@@ -29,11 +29,13 @@ class sm_subfun_unlock
     public $funTypeId;
 
     /**
-    * @var Int32 活动类型
-    *  1.限时活动:开始时间:解锁时间;结束时间:刷新时间+解锁时间
-    *  2.周期活动:开始时间:固定时间;结束时间:刷新时间+开始时间
-    *  3.固定活动:开始时间:固定时间;结束时间:固定时间;
-    *  4.不限时活动:开始时间:固定时间;结束时间:无（长时间存在）  
+    * @var Int32 1.限时的活动 开始时间(功能解锁时间) 结束时间( 开始时间+刷新时间) 配置 ts(刷新时间)  
+    *  2.周期活动 开始时间(功能解锁时间) ts 隔几天刷新 类型： 1(天) 2（一周） 3（两周）4（两天）
+    *  3.周期活动 开始时间(配置开始时间) ts 隔几天刷新 类型： 1(天) 2（一周） 3（两周）
+    *  4.固定活动 开始时间 结束时间 【仙树寻宝】
+    *  5.不限时活动 长期存在  开始时间(功能解锁时间) 长期存在 
+    *  6.不限时活动 长期存在 配置好开始时间 长期存在 
+    *  7.开始时间(功能解锁时间) 不长期存在 奖励领取后消失  
     */
     public $type;
 
@@ -48,7 +50,8 @@ class sm_subfun_unlock
     public $endTs;
 
     /**
-    * @var String 活动持续时间  
+    * @var String 活动持续时间(单秒:秒)
+    *    
     */
     public $ts;
 
@@ -62,16 +65,6 @@ class sm_subfun_unlock
     */
     public $desc;
 
-    /**
-    * @var Int32 解锁类型  
-    */
-    public $unlockType;
-
-    /**
-    * @var Int32 对应条件的关卡ID  
-    */
-    public $unlockGateId;
-
     /**
     * @var Int32 解锁顺序  
     */

Gameserver/App/model/Const/sm_waveItem.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-19 16:07:28
+ // 日期: 2024-09-24 18:03:18
 ////////////////////
 
 

Gameserver/App/model/Const/sm_waves.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-09-19 16:07:28
+ // 日期: 2024-09-24 18:03:18
 ////////////////////
 
 

Gameserver/App/process/FightProc.php

@@ -8,6 +8,9 @@ namespace loyalsoft;
  */
 class FightProc {
 
+    /**
+     * @deprecated since version 已转移到global中
+     */
     public const TowerGateId = 940011999;
 
     /**
@@ -135,7 +138,7 @@ class FightProc {
         TaskProc::OnPassMainChallengeGate_X_Num($gateId, $index);
         TaskProc::OnKillCommonNumMonster($killMonsterNum);
         TaskProc::OnKillleaderNumMonster($killBossNum);
-        
+
         //TaskProc::Day7TaskReset();
         UserProc::updateUserInfo();
         return Resp::ok(array("task" => ctx()->task,
@@ -162,9 +165,9 @@ class FightProc {
         StoreProc::AddMultiItemInStore($mo->$prize);
         UserProc::updateUserInfo();
         return Resp::ok(array(
-                    'gold'=> ctx()->baseInfo->gold,
-                    'cash'=> ctx()->baseInfo->cash,
-                    'store'=> ctx()->store,
+                    'gold' => ctx()->baseInfo->gold,
+                    'cash' => ctx()->baseInfo->cash,
+                    'store' => ctx()->store,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
         ));
@@ -491,7 +494,7 @@ class FightProc {
         list($finalLayer, $killedMonster, $killedBoss) = req()->paras;          # 战斗结束时的层数
 
         $lastLayer = ctx()->gates()->TowerGateInfo()->CurLayer;
-        $arr = GameConfig::waves_getItemArray(self::TowerGateId);
+        $arr = GameConfig::waves_getItemArray(glc()->TowerGateId);
         TaskProc::OnFightNumChallengeGate();
         TaskProc::OnKillCommonNumMonster($killedMonster);
         TaskProc::OnKillleaderNumMonster($killedBoss);
@@ -646,7 +649,7 @@ class FightProc {
 
             if (ctx()->gates->GateList->$gateId->pass == 0) {
                 ctx()->gates->GateList->$gateId->pass = 1;
-                                              
+
                 $maxGateId = ctx()->gates->maxPassGateNumId();
 
                 if ($maxGateId > 0) {
@@ -764,8 +767,8 @@ class FightProc {
         return Resp::ok($ret);
     }
 
-// <editor-fold defaultstate="collapsed" desc="功能解锁">   
-  
+// <editor-fold defaultstate="collapsed" desc="功能解锁">
+
     /**
      * 检测功能解锁的 关卡
      * @param type $resultType
@@ -775,7 +778,7 @@ class FightProc {
     static function funUnlock_Gate($resultType, $gateId) {
         $dic = GameConfig::fun_unlock();
         foreach ($dic as $id => $mo) {
-            if ($mo->unlockTip == 1) {//$mo->unlockGateId == $gateId              
+            if ($mo->unlockTip == 1) {//$mo->unlockGateId == $gateId
                 $tag = false;
                 if ($mo->unlockType1 != null) {
                     //1:参与战斗结束即可  2战斗胜利  3某场战斗参加N次数才行
@@ -831,7 +834,7 @@ class FightProc {
         $dic = GameConfig::fun_unlock();
         foreach ($dic as $id => $mo) {
             $tag = false;
-            if ($mo->unlockTip == 1) {//$mo->unlockGateId == $gateId               
+            if ($mo->unlockTip == 1) {//$mo->unlockGateId == $gateId
                 if ($mo->unlockType1 != null && $mo->unlockType1 == Enum_FunUnlockType::getGem && ctx()->store->gemStore == null) {
                     $tag = true;
                 }
@@ -856,7 +859,7 @@ class FightProc {
         $dic = GameConfig::fun_unlock();
         foreach ($dic as $id => $mo) {
             $tag = false;
-            if ($mo->unlockTip == 1) {//$mo->unlockGateId == $gateId               
+            if ($mo->unlockTip == 1) {//$mo->unlockGateId == $gateId
                 if ($mo->unlockType1 != null && $mo->unlockType1 == Enum_FunUnlockType::userLv && $mo->unlockParas1 == $level) {
                     $tag = true;
                 }
@@ -880,7 +883,7 @@ class FightProc {
         $dic = GameConfig::fun_unlock();
         foreach ($dic as $id => $mo) {
             $tag = false;
-            if ($mo->unlockTip == 1) {//$mo->unlockGateId == $gateId              
+            if ($mo->unlockTip == 1) {//$mo->unlockGateId == $gateId
                 if ($mo->unlockType1 != null && $result = true && $mo->unlockType1 == Enum_FunUnlockType::mainChallengeGate_State) {
                     $str = explode(',', $mo->unlockParas1);
                     $uGateId = $str[0];
@@ -979,11 +982,11 @@ class FightProc {
     static function SubFunDateInit_FunUnlock($type) {
         $dic = GameConfig::subfun_unlock();
         foreach ($dic as $id => $mo) {
-            if($mo->funTypeId != $type){
+            if ($mo->funTypeId != $type) {
                 continue;
-            }            
-            
-            if($mo->type == 1 && $mo->id == Enum_SubFunType::Day7_Happy){
+            }
+
+            if ($mo->type == 1 && $mo->id == Enum_SubFunType::Day7_Happy) {
                 TaskProc::Day7TaskReset();
             }
             if($mo->type == 2 && $mo->id == Enum_SubFunType::DailyTask){
@@ -991,25 +994,24 @@ class FightProc {
             }
             
             if($mo->type == 2 && $mo->id == Enum_SubFunType::WeekTask){
-                TaskProc::WeekTaskReset(true);
+                TaskProc::WeekTaskReset(true);            
             }
-            
         }
     }
-    
+
     /**
      * 次级功能解锁数据初始化
      */
     static function SubFunDateInit_Config() {
         $dic = GameConfig::subfun_unlock();
-        foreach ($dic as $id => $mo) {                                  
-            if($mo->type == 3 && $mo->id == Enum_SubFunType::LimitTsSale && ctx()->privateState->nextDayLogin == 0){
-                ctx()->privateState->nextDayLogin = now(); 
-            }                       
+        foreach ($dic as $id => $mo) {
+            if ($mo->type == 3 && $mo->id == Enum_SubFunType::LimitTsSale && ctx()->privateState->nextDayLogin == 0) {
+                ctx()->privateState->nextDayLogin = now();
+            }
         }
     }
 
-// </editor-fold> 
+// </editor-fold>
 // <editor-fold defaultstate="collapsed" desc="技能解锁">
 
     /**

Gameserver/App/process/PayProc.php

@@ -401,8 +401,7 @@ class PayProc {
                     $cashMo = GameConfig::shop_cash_getItem($shopItem->shopItemTypeId);
                     my_Assert(null != $cashMo, ErrCode::err_const_no);
 //                    StoreProc::AddMultiItemInStore($cashMo->reward, "付费");
-                    ShopProc::BuyShop_Cash(EnumShopGift::Cash_Shop, $shopItem->shopItemTypeId, $order->product_count);
-                    self::$retArr[] = $cashMo->reward;
+                    self::$retArr[] = ShopProc::BuyShop_Cash(EnumShopGift::Cash_Shop, $shopItem->shopItemTypeId, $order->product_count);
                     break;
                 case 'monthcard':                                               # 月卡
                     $monthCardMo = GameConfig::shop_monthcard_getItem($shopItem->shopItemTypeId);

Gameserver/App/process/ShopProc.php

@@ -75,12 +75,12 @@ class ShopProc {
         list($type, $typeId, $buyNum) = req()->paras;
         $user = ctx();
 
-        //$resultArr = array();       
+        //$resultArr = array();
         switch ($type) {
             case EnumShopGift::GateGift_Shop://章节礼包
                 $gateGift = self::BuyShop_GateGift($type, $typeId, $buyNum);
                 break;
-            case EnumShopGift::Daily_Shop://每日商店                             
+            case EnumShopGift::Daily_Shop://每日商店
                 self::BuyShop_Daily($type, $typeId, $buyNum);
                 break;
 
@@ -99,7 +99,7 @@ class ShopProc {
                 break;
 
             case EnumShopGift::MonthCard_Shop:
-                self::BuyShop_MonthCard($type, $typeId, $buyNum);    
+                self::BuyShop_MonthCard($type, $typeId, $buyNum);
                 break;
             default:
                 break;
@@ -126,7 +126,7 @@ class ShopProc {
                     'reward_Gem' => StoreProc::$reward_Gem,
         ));
     }
-       
+
     /*
      * 商城章节礼包购买
      */
@@ -163,7 +163,7 @@ class ShopProc {
         }
         ctx()->privateState->gateGiftReceived[] = $typeId;
         ctx()->baseInfo->charge_amt += $mo->curPrice;
-        
+
         return $gateGift;
     }
 
@@ -271,7 +271,7 @@ class ShopProc {
         TaskProc::OnOpenNumBrightBox($typeId, $buyNum);
         TaskProc::OnOpenNumAnyBox($buyNum);
         FightProc::funUnlock_Gem();
-        
+
         $perList = explode(';', $mo->percent);
         $allNum = 0;
         foreach ($perList as $key => $value) {
@@ -426,18 +426,19 @@ class ShopProc {
         }
 
         StoreProc::AddMultiItemInStore($reward);
-        ctx()->baseInfo->accumulateYuanBao += $addYuanbao;        
-        ctx()->baseInfo->charge_amt += $mo->price;        
+        ctx()->baseInfo->accumulateYuanBao += $addYuanbao;
+        ctx()->baseInfo->charge_amt += $mo->price;
         ctx()->privateState->cashShopReceived[] = $typeId;
-        
-        if(ctx()->privateState->firstRecharge_receiveTag == 0){
+
+        if (ctx()->privateState->firstRecharge_receiveTag == 0) {
             ctx()->privateState->firstRechargeUI_OpenTip = 1;
         }
-        
-        if(ctx()->privateState->firstRecharge_receiveTag < 1){
+
+        if (ctx()->privateState->firstRecharge_receiveTag < 1) {
             ctx()->privateState->firstRecharge_receiveTag = 1;
-        }              
+        }
         TaskProc::OnRecharge();
+        return $reward;
     }
 
     /**
@@ -523,7 +524,7 @@ class ShopProc {
         $mo = GameConfig::shop_monthcard_getItem($typeId);
         my_Assert($mo != null, ErrCode::err_const_no);
 
-        //$user->privateState->monthCardShop_Received[] = $typeId;                             
+        //$user->privateState->monthCardShop_Received[] = $typeId;
         if ($typeId == 1) {
             my_Assert(ctx()->privateState->monthCardShop_ts == 0, ErrCode::err_const_no);
             ctx()->privateState->monthCardShop_ts = now();
@@ -649,5 +650,4 @@ class ShopProc {
         ctx()->privateState->dailyShopRandItems = $result;
         UserProc::updateUserInfo();
     }
-
 }