Эх сурвалжийг харах

Merge branch 'dev' of http://ylsjtt.game7000.com:3000/YLSJ/jzhj2024server into dev

wanggangzero 8 сар өмнө
parent
commit
08dd5a73b0

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
  // author: gwang 
- // 日期: 2024-09-27 17:05:22
+ // 日期: 2024-09-29 16:36:58
 ////////////////////
 ////////////////////
 
 
 /**
 /**

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
  // author: gwang 
- // 日期: 2024-09-27 10:27:41
+ // 日期: 2024-09-29 16:05:51
 ////////////////////
 ////////////////////
 
 
 
 

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
  // author: gwang 
- // 日期: 2024-09-27 10:28:03
+ // 日期: 2024-09-29 16:05:51
 ////////////////////
 ////////////////////
 
 
 
 

+ 6 - 2
Gameserver/App/model/Const/sm_fun_unlock.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
  // author: gwang 
- // 日期: 2024-09-24 17:05:51
+ // 日期: 2024-09-29 16:05:51
 ////////////////////
 ////////////////////
 
 
 
 
@@ -53,7 +53,11 @@ class sm_fun_unlock
     public $unlockParas1;
     public $unlockParas1;
 
 
     /**
     /**
-    * @var Int32 解锁条件2  
+    * @var Int32 1:参与关卡;参数1:关卡ID  
+    *  2:通关关卡;参数1:关卡ID
+    *  3:初次得到技能宝石;参数1:无
+    *  4:玩家等级到达某级;参数1:等级数
+    *  5:通关主线挑战;参数1:无  
     */
     */
     public $unlockType2;
     public $unlockType2;
 
 

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

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

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
  // author: gwang 
- // 日期: 2024-09-26 15:35:51
+ // 日期: 2024-09-29 16:35:51
 ////////////////////
 ////////////////////
 
 
 
 

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
  // author: gwang 
- // 日期: 2024-09-26 15:35:51
+ // 日期: 2024-09-29 16:35:51
 ////////////////////
 ////////////////////
 
 
 
 

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

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

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
  // author: gwang 
- // 日期: 2024-09-27 10:05:04
+ // 日期: 2024-09-29 16:26:42
 ////////////////////
 ////////////////////
 
 
 
 

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
  // author: gwang 
- // 日期: 2024-09-27 14:39:37
+ // 日期: 2024-09-29 14:45:19
 ////////////////////
 ////////////////////
 
 
 
 

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
  // author: gwang 
- // 日期: 2024-09-27 11:20:16
+ // 日期: 2024-09-29 14:56:14
 ////////////////////
 ////////////////////
 
 
 
 

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
  // author: gwang 
- // 日期: 2024-09-27 11:20:16
+ // 日期: 2024-09-29 14:56:14
 ////////////////////
 ////////////////////
 
 
 
 

+ 3 - 3
Gameserver/App/process/ActiveProc.php

@@ -311,7 +311,7 @@ class ActiveProc {
      * 7日签到 数据更新
      * 7日签到 数据更新
      */
      */
     public static function DailyResetDay7Task($unlock = false) {
     public static function DailyResetDay7Task($unlock = false) {
-        if(!$unlock && !FightProc::isFunUnlock(Enum_SubFunType::Day7_Sign)){//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题,fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
+        if(!$unlock && !FightProc::isFunUnlock(5)){//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题,fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
             return;
             return;
         }
         }
         
         
@@ -325,7 +325,7 @@ class ActiveProc {
     }
     }
 
 
     /**
     /**
-     * 7日签到
+     * 6101 签到
      * @return type
      * @return type
      */
      */
     public static function Day7_DrawReward() {
     public static function Day7_DrawReward() {
@@ -342,7 +342,7 @@ class ActiveProc {
         return Resp::ok(array('gold' => ctx()->baseInfo->gold,
         return Resp::ok(array('gold' => ctx()->baseInfo->gold,
                     'cash' => ctx()->baseInfo->cash,
                     'cash' => ctx()->baseInfo->cash,
                     'store' => ctx()->store,
                     'store' => ctx()->store,
-                    //'day7_drawed;' => ctx()->privateState->day7_drawed,                
+                    'roleCardUnlockHeroList;' => ctx()->heros->roleCardUnlockHeroList,                
                     'reward' => StoreProc::$reward,
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
                     'reward_Gem' => StoreProc::$reward_Gem,
         ));
         ));

+ 4 - 2
Gameserver/App/process/FightProc.php

@@ -142,8 +142,9 @@ class FightProc {
         //TaskProc::Day7TaskReset();
         //TaskProc::Day7TaskReset();
         UserProc::updateUserInfo();
         UserProc::updateUserInfo();
         return Resp::ok(array("task" => ctx()->task,
         return Resp::ok(array("task" => ctx()->task,
-                    'funUnlockRecord' => ctx()->privateState->funUnlockRecord,
-                    'funUnlockRecord_2' => ctx()->privateState->funUnlockRecord_2,
+                    'privateState'=> ctx()->privateState,
+                   // 'funUnlockRecord' => ctx()->privateState->funUnlockRecord,
+                   // 'funUnlockRecord_2' => ctx()->privateState->funUnlockRecord_2,
         ));
         ));
     }
     }
 
 
@@ -760,6 +761,7 @@ class FightProc {
             'newLevel' => $newLevel,
             'newLevel' => $newLevel,
             'funUnlockRecord' => ctx()->privateState->funUnlockRecord,
             'funUnlockRecord' => ctx()->privateState->funUnlockRecord,
             'funUnlockRecord_2' => ctx()->privateState->funUnlockRecord_2,
             'funUnlockRecord_2' => ctx()->privateState->funUnlockRecord_2,
+            'LoginDays'=> ctx()->privateState->LoginDays,            
             'skillUnlockRecord' => ctx()->privateState->skillUnlockRecord,
             'skillUnlockRecord' => ctx()->privateState->skillUnlockRecord,
             'heros' => ctx()->heros,
             'heros' => ctx()->heros,
             'subFunStartTs' => ctx()->privateState->subFunStartTs,
             'subFunStartTs' => ctx()->privateState->subFunStartTs,

+ 2 - 0
Gameserver/App/process/ShopProc.php

@@ -133,8 +133,10 @@ class ShopProc {
 
 
     public static function BuyShop_GateGift($type, $typeId, $buyNum) {
     public static function BuyShop_GateGift($type, $typeId, $buyNum) {
         //$gateGift = array();
         //$gateGift = array();
+        my_Assert(in_array($typeId, ctx()->gates->GateList), ErrCode::active_const_no_err);
         my_Assert(!in_array($typeId, ctx()->privateState->gateGiftReceived), ErrCode::user_shop_NotRepeatBuy);
         my_Assert(!in_array($typeId, ctx()->privateState->gateGiftReceived), ErrCode::user_shop_NotRepeatBuy);
 
 
+        
         $mo = GameConfig::shop_gategift_getItem($typeId);
         $mo = GameConfig::shop_gategift_getItem($typeId);
         my_Assert($mo != null, ErrCode::err_const_no);
         my_Assert($mo != null, ErrCode::err_const_no);
         StoreProc::AddMultiItemInStore($mo->reward);
         StoreProc::AddMultiItemInStore($mo->reward);

+ 1 - 1
Gameserver/nbproject/project.properties

@@ -2,7 +2,7 @@ auxiliary.org-netbeans-modules-php-smarty.smarty-framework=true
 auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
 auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
 browser.reload.on.save=true
 browser.reload.on.save=true
 include.path=${php.global.include.path}
 include.path=${php.global.include.path}
-php.version=PHP_81
+php.version=PHP_80
 source.encoding=UTF-8
 source.encoding=UTF-8
 src.dir=.
 src.dir=.
 tags.asp=false
 tags.asp=false