cyzhao il y a 1 an
Parent
commit
727ef3d63c

Fichier diff supprimé car celui-ci est trop grand
+ 370 - 0
DevOps/flscfg/sqlback/jzhj2023_cfg20230823094829.sql


+ 21 - 19
Gameserver/App/model/User/Info_Gates.php

@@ -14,57 +14,59 @@ namespace loyalsoft;
  * @author c'y'zhao
  */
 class Info_Gates extends Object_ext {
+
     /**
      * 当前剧情选择的关卡
      */
     public $CurrentGateId = 0;
+
     /**
      * 已解锁剧情关卡的最大id
      * @var type
      */
-    public $UnlockedGatesMaxId = 0; 
+    public $UnlockedGatesMaxId = 0;
+
     /**
      * 章节列表
      * @var Ins_GateInfo
      */
     public $GateList = null;
-    
+
     /**
      * 挑战功能领取记录
-     * @var new \stdClass()
+     * @var type
      */
     public $GatesChallengeRecord = null;
-    
-    public function initialize() {       
-        $startId= 1;
+
+    public function initialize() {
+        $startId = 1;
         $this->CurrentGateId = $startId;
         $this->UnlockedGatesMaxId = $startId;
-            
-        $this->GateList = new \stdClass();    
+
+        $this->GateList = new \stdClass();
         $Ins_GateInfo = new Ins_GateInfo();
         $Ins_GateInfo->GateId = $this->CurrentGateId;
-        $this->GateList->$startId=$Ins_GateInfo;     
-        
+        $this->GateList->$startId = $Ins_GateInfo;
+
         $this->GatesChallengeRecord = new \stdClass();
     }
-    
+
     public function __construct($arg = null) {
-        if($tag == null){            
-            if($this->CurrentGateId == 0){
-                $startId= 1;
+        if ($arg == null) {
+            if ($this->CurrentGateId == 0) {
+                $startId = 1;
                 $this->CurrentGateId = $startId;
                 $this->UnlockedGatesMaxId = $startId;
-            
-                $this->GateList = new \stdClass();    
+
+                $this->GateList = new \stdClass();
                 $Ins_GateInfo = new Ins_GateInfo();
                 $Ins_GateInfo->GateId = $this->CurrentGateId;
                 $this->GateList->$startId=$Ins_GateInfo;                       
             }
             
             $this->GatesChallengeRecord = new \stdClass();
-            
-        }else{			
-            parent::__construct($arg);
+        } else {
+            parent::__construct($arg);           
         }
     }
 }

+ 9 - 9
Gameserver/App/model/User/Info_Heros.php

@@ -14,38 +14,38 @@ namespace loyalsoft;
  * @author c'y'zhao
  */
 class Info_Heros extends Object_ext {
+
     /**
      * 当前的hero
      */
     public $CurrentHeroId = 0;
-    
+
     /**
      * 所有的hero集合
      * @var type
      */
     public $Dic = null;
-    
+
     public function initialize() {
-        $curHeroId = 1;//临时
+        $curHeroId = 1; //临时
         $this->CurrentHeroId = $curHeroId;
         $this->Dic = new \stdClass();
         $insHero = new Ins_Hero();
         $insHero->Id = $curHeroId;
         $this->Dic->$curHeroId = $insHero;
     }
-    
+
     public function __construct($arg = null) {
-        if($tag == null){
-            if($this->CurrentHeroId == 0 ){
-                $curHeroId = 1;//临时
+        if ($arg == null) {
+            if ($this->CurrentHeroId == 0) {
+                $curHeroId = 1; //临时
                 $this->CurrentHeroId = $curHeroId;
                 $this->Dic = new \stdClass();
                 $insHero = new Ins_Hero();
                 $insHero->Id = $curHeroId;
                 $this->Dic->$curHeroId = $insHero;
             }
-            
-        }else{			
+        } else {
             parent::__construct($arg);
         }
     }

+ 11 - 17
Gameserver/App/model/User/Info_PrivateState.php

@@ -14,7 +14,7 @@ namespace loyalsoft;
  * @author c'y'zhao
  */
 class Info_PrivateState extends Object_ext {
-    
+
     /**
      * 章节宝箱的购买记录
      * @var type
@@ -35,7 +35,7 @@ class Info_PrivateState extends Object_ext {
      */
     #[ArrayType]
     public $dailyShopRandItems = array();
-  
+
     /**
      * 金币商店购买记录
      */
@@ -47,10 +47,8 @@ class Info_PrivateState extends Object_ext {
      */
     #[ArrayType]
     public $cashShopReceived = array();
-
-    
     public $supplyBichuDic = null;
-    
+
 //    public $supplyShopNum_JunyongBox = 0;
 //
 //    public $supplyShopNum_BujiBox = 0;
@@ -65,7 +63,6 @@ class Info_PrivateState extends Object_ext {
 //     * @var type
 //     */
 //    public $supplyShop_BujiBoxBichuNum = 0;
-    
 //    /**
 //     * 军用物资箱是否已经有必出了
 //     * @var type
@@ -77,38 +74,35 @@ class Info_PrivateState extends Object_ext {
 //     * @var type
 //     */
 //    public $supplyShop_BujiBoxBichu = 0;
-    
+
     /**
      * 每天买的数量,每日重置(S级军备和补给箱)
      * @var type
      */
     public $junbeiShopNumRecord = null;
-    
+
     /**
      * 总的数量,每日不重置,必出后重置
      * @var type
      */
     public $junbeiShop_AllNumRecord = null;
-
-
     public $junbeiShop_XinYuan = null;
-    
-    public function initialize() {              
+
+    public function initialize() {
         $this->junbeiShopNumRecord = new \stdClass();
         $this->junbeiShop_AllNumRecord = new \stdClass();
         $this->junbeiShop_XinYuan = new \stdClass();
     }
-    
+
     public function __construct($arg = null) {
-        if($tag == null){
-            if($this->junbeiShopNumRecord == null){
+        if ($arg == null) {
+            if ($this->junbeiShopNumRecord == null) {
                 $this->junbeiShopNumRecord = new \stdClass();
                 $this->junbeiShop_AllNumRecord = new \stdClass();
                 $this->junbeiShop_XinYuan = new \stdClass();
                 $this->supplyBichuDic = new \stdClass();
             }
-                       
-        }else{			
+        } else {
             parent::__construct($arg);
         }
     }

+ 11 - 13
Gameserver/App/model/User/Info_Store.php

@@ -14,41 +14,39 @@ namespace loyalsoft;
  * @author c'y'zhao
  */
 class Info_Store extends Object_ext {
-    
+
     /**
      * 道具
      * @var type
      */
     public $items;
-    
+
     /**
      * 装备
      * @var type
      */
     public $equip;
-    
+
     public function initialize() {
         $this->items = new \stdClass();
         $this->equip = new \stdClass();
     }
-    
+
     public function __construct($arg = null) {
-        if($tag == null){
+        if ($arg == null) {
             $this->items = new \stdClass();
-            $this->equip = new \stdClass();        
-        }else{			
+            $this->equip = new \stdClass();
+        } else {
             parent::__construct($arg);
         }
     }
-    
-    public function removeItem($itemId,$num) {
-        if(StlUtil::dictHasProperty($this->items, $itemId)){
+
+    public function removeItem($itemId, $num) {
+        if (StlUtil::dictHasProperty($this->items, $itemId)) {
             $this->items->$itemId -= $num;
-            if($this->items->$itemId <= 0){
+            if ($this->items->$itemId <= 0) {
                 unset($this->items->$itemId);
             }
         }
-        
-        
     }
 }

+ 2 - 2
Gameserver/App/util/CRedisUtil.php

@@ -702,9 +702,9 @@ Lua;
         try {
             $castoken = "stVer";
             $casVer = $dic->stVer;
-            CLog::err($dic->toString());
+//            CLog::err($dic->toString());
             $ret = $this->redis->eval($script, 2, $key, $castoken, $casVer, $dic->toString());  # redis 执行lua脚本
-            CLog::err($dic->toString());
+//            CLog::err($dic->toString());
             if (0 == $ret) {
                 return false;
             }

+ 1 - 1
Gameserver/App/util/UtilInclude.php

@@ -18,5 +18,5 @@ require_once 'SelfChecker.php';
 require_once 'dao.php';                                                                                                                # dao辅助脚本
 require_once 'Bits.php';                                                                                                                # bit操作辅助
 //require_once __DIR__ . '/volcengine/VolcUtil.php';                               # 导入火山引擎封装
-require_once __DIR__ . '/tapdb/TapDBUtil.php';
+//require_once __DIR__ . '/tapdb/TapDBUtil.php';
 //require_once ROOTDIR . '/Util/traits/RedisFlat.php';

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff