Sfoglia il codice sorgente

排行红点接口

cyzhao 1 anno fa
parent
commit
436405b5b0

+ 1 - 1
Gameserver/App/base/CmdCode.php

@@ -355,7 +355,7 @@ class CmdCode {
     const fight_rank_ReceiveRankReward_FightPower = 6816;
     
     /**
-     * 荣誉榜奖励
+     * 是否存在未领取的荣誉榜奖励
      */
     const fight_rank_IsExistRankReward = 6817;
     // </editor-fold>

+ 417 - 404
Gameserver/App/configs/GameConfig.php

@@ -1,41 +1,38 @@
 <?php
-
 ////////////////////
-// 由CodeGenerator创建。
-// Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
-// author: gwang
-// 日期: 2024-06-05 18:14:10
+ // 由CodeGenerator创建。
+ // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
+ // author: gwang 
+ // 日期: 2024-06-07 15:50:47
 ////////////////////
 
 namespace loyalsoft;
 
 /**
- * 常量配置数据
+ * 常量配置数据 
  */
 class GameConfig {
-// <editor-fold defaultstate="collapsed" desc="  基础代码 ">
-
+// <editor-fold defaultstate="collapsed" desc="  基础代码 ">    
     /**
-     * 是否启用codegen
+     * 是否启用codegen 
      */
-    private static function isCG() {
-        return defined('CodeGen_Enabled') && CodeGen_Enabled;
+    private static function isCG()  {
+        return defined('CodeGen_Enabled') && CodeGen_Enabled; 
     }
-
     /**
      * @var bool 分区是否使用独立的常量配置数据
      */
     private static $useZoneId = false;
-
     /**
      * 追加分区列表字符串
      * @return string
      */
-    private static function zoneid() {
+    private static function zoneid()
+    {
         global $zoneid;
         return self::$useZoneId ? "-zone$zoneid" : "";
     }
-
+	
     /**
      * @return ClientVersion
      */
@@ -87,625 +84,641 @@ class GameConfig {
         }
         return null;
     }
-
 // </editor-fold>
-
     /**
-     * 全局参数
-     * @return \globalsettings
-     */
-    public static function globalsettings() {
-        static $a = null;
+    * 全局参数
+    * @return \globalsettings
+    */
+    public static function globalsettings()
+    { 
+        static $a = null; 
         return self::initValue($a, 'globalsettings');
     }
-
     /**
-     * 停服计划
-     * @return \service_schedule
-     */
-    public static function service_schedule() {
-        static $a = null;
+    * 停服计划
+    * @return \service_schedule
+    */
+    public static function service_schedule()
+    { 
+        static $a = null; 
         return self::initValue($a, 'service_schedule');
     }
-
     /**
-     * @return \sm_service_schedule service_schedule item数据
-     */
-    public static function service_schedule_getItem($itemid) {
+    * @return \sm_service_schedule service_schedule item数据 
+    */
+    public static function service_schedule_getItem($itemid)
+    { 
         return self::get_hash_item('service_schedule', $itemid);
     }
-
     /**
-     * 道具表
-     * @return \item
-     */
-    public static function item() {
-        static $a = null;
+    * 道具表
+    * @return \item
+    */
+    public static function item()
+    { 
+        static $a = null; 
         return self::initValue($a, 'item');
     }
-
     /**
-     * @return \sm_item item item数据
-     */
-    public static function item_getItem($itemid) {
+    * @return \sm_item item item数据 
+    */
+    public static function item_getItem($itemid)
+    { 
         return self::get_hash_item('item', $itemid);
     }
-
     /**
-     * 系统邮件
-     * @return \sysmail
-     */
-    public static function sysmail() {
-        static $a = null;
+    * 系统邮件
+    * @return \sysmail
+    */
+    public static function sysmail()
+    { 
+        static $a = null; 
         return self::initValue($a, 'sysmail');
     }
-
     /**
-     * @return \sm_sysmail sysmail item数据
-     */
-    public static function sysmail_getItem($itemid) {
+    * @return \sm_sysmail sysmail item数据 
+    */
+    public static function sysmail_getItem($itemid)
+    { 
         return self::get_hash_item('sysmail', $itemid);
     }
-
     /**
-     * 客户端版本信息
-     * @return \clientVersionHistory
-     */
-    public static function clientVersionHistory() {
-        static $a = null;
+    * 客户端版本信息
+    * @return \clientVersionHistory
+    */
+    public static function clientVersionHistory()
+    { 
+        static $a = null; 
         return self::initValue($a, 'clientVersionHistory');
     }
-
     /**
-     * @return \sm_clientVersionHistory clientVersionHistory item数据
-     */
-    public static function clientVersionHistory_getItem($itemid) {
+    * @return \sm_clientVersionHistory clientVersionHistory item数据 
+    */
+    public static function clientVersionHistory_getItem($itemid)
+    { 
         return self::get_hash_item('clientVersionHistory', $itemid);
     }
-
     /**
-     * 错误信息表
-     * @return \errmsg
-     */
-    public static function errmsg() {
-        static $a = null;
+    * 错误信息表
+    * @return \errmsg
+    */
+    public static function errmsg()
+    { 
+        static $a = null; 
         return self::initValue($a, 'errmsg');
     }
-
     /**
-     * @return \sm_errmsg errmsg item数据
-     */
-    public static function errmsg_getItem($itemid) {
+    * @return \sm_errmsg errmsg item数据 
+    */
+    public static function errmsg_getItem($itemid)
+    { 
         return self::get_hash_item('errmsg', $itemid);
     }
-
     /**
-     * 战斗: 波次表
-     * @return \waves
-     */
-    public static function waves() {
-        static $a = null;
+    * 战斗: 波次表
+    * @return \waves
+    */
+    public static function waves()
+    { 
+        static $a = null; 
         return self::initValue($a, 'waves');
     }
-
     /**
-     * @return \sm_waves waves itemArray
-     */
-    public static function waves_getItemArray($key) {
+    * @return \sm_waves waves itemArray 
+    */
+    public static function waves_getItemArray($key)
+    { 
         return self::get_hash_item('waves', $key);
     }
-
     /**
-     * 活动: 七日签到
-     * @return \activity_day7
-     */
-    public static function activity_day7() {
-        static $a = null;
+    * 活动: 七日签到
+    * @return \activity_day7
+    */
+    public static function activity_day7()
+    { 
+        static $a = null; 
         return self::initValue($a, 'activity_day7');
     }
-
     /**
-     * @return \sm_activity_day7 activity_day7 item数据
-     */
-    public static function activity_day7_getItem($itemid) {
+    * @return \sm_activity_day7 activity_day7 item数据 
+    */
+    public static function activity_day7_getItem($itemid)
+    { 
         return self::get_hash_item('activity_day7', $itemid);
     }
-
     /**
-     * 章节表
-     * @return \gate
-     */
-    public static function gate() {
-        static $a = null;
+    * 章节表
+    * @return \gate
+    */
+    public static function gate()
+    { 
+        static $a = null; 
         return self::initValue($a, 'gate');
     }
-
     /**
-     * @return \sm_gate gate item数据
-     */
-    public static function gate_getItem($itemid) {
+    * @return \sm_gate gate item数据 
+    */
+    public static function gate_getItem($itemid)
+    { 
         return self::get_hash_item('gate', $itemid);
     }
-
     /**
-     * 角色
-     * @return \hero
-     */
-    public static function hero() {
-        static $a = null;
+    * 角色
+    * @return \hero
+    */
+    public static function hero()
+    { 
+        static $a = null; 
         return self::initValue($a, 'hero');
     }
-
     /**
-     * @return \sm_hero hero item数据
-     */
-    public static function hero_getItem($itemid) {
+    * @return \sm_hero hero item数据 
+    */
+    public static function hero_getItem($itemid)
+    { 
         return self::get_hash_item('hero', $itemid);
     }
-
     /**
-     * 装备表
-     * @return \equip
-     */
-    public static function equip() {
-        static $a = null;
+    * 装备表
+    * @return \equip
+    */
+    public static function equip()
+    { 
+        static $a = null; 
         return self::initValue($a, 'equip');
     }
-
     /**
-     * @return \sm_equip equip item数据
-     */
-    public static function equip_getItem($itemid) {
+    * @return \sm_equip equip item数据 
+    */
+    public static function equip_getItem($itemid)
+    { 
         return self::get_hash_item('equip', $itemid);
     }
-
     /**
-     * 装备升级表
-     * @return \equip_levelupgrade
-     */
-    public static function equip_levelupgrade() {
-        static $a = null;
+    * 装备升级表
+    * @return \equip_levelupgrade
+    */
+    public static function equip_levelupgrade()
+    { 
+        static $a = null; 
         return self::initValue($a, 'equip_levelupgrade');
     }
-
     /**
-     * @return \sm_equip_levelupgrade equip_levelupgrade item数据
-     */
-    public static function equip_levelupgrade_getItem($itemid) {
+    * @return \sm_equip_levelupgrade equip_levelupgrade item数据 
+    */
+    public static function equip_levelupgrade_getItem($itemid)
+    { 
         return self::get_hash_item('equip_levelupgrade', $itemid);
     }
-
     /**
-     * 章节礼包表
-     * @return \shop_gategift
-     */
-    public static function shop_gategift() {
-        static $a = null;
+    * 章节礼包表
+    * @return \shop_gategift
+    */
+    public static function shop_gategift()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_gategift');
     }
-
     /**
-     * @return \sm_shop_gategift shop_gategift item数据
-     */
-    public static function shop_gategift_getItem($itemid) {
+    * @return \sm_shop_gategift shop_gategift item数据 
+    */
+    public static function shop_gategift_getItem($itemid)
+    { 
         return self::get_hash_item('shop_gategift', $itemid);
     }
-
     /**
-     * 每日商店
-     * @return \shop_daily
-     */
-    public static function shop_daily() {
-        static $a = null;
+    * 每日商店
+    * @return \shop_daily
+    */
+    public static function shop_daily()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_daily');
     }
-
     /**
-     * @return \sm_shop_daily shop_daily item数据
-     */
-    public static function shop_daily_getItem($itemid) {
+    * @return \sm_shop_daily shop_daily item数据 
+    */
+    public static function shop_daily_getItem($itemid)
+    { 
         return self::get_hash_item('shop_daily', $itemid);
     }
-
     /**
-     * 钻石商店
-     * @return \shop_cash
-     */
-    public static function shop_cash() {
-        static $a = null;
+    * 钻石商店
+    * @return \shop_cash
+    */
+    public static function shop_cash()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_cash');
     }
-
     /**
-     * @return \sm_shop_cash shop_cash item数据
-     */
-    public static function shop_cash_getItem($itemid) {
+    * @return \sm_shop_cash shop_cash item数据 
+    */
+    public static function shop_cash_getItem($itemid)
+    { 
         return self::get_hash_item('shop_cash', $itemid);
     }
-
     /**
-     * 金币商店
-     * @return \shop_gold
-     */
-    public static function shop_gold() {
-        static $a = null;
+    * 金币商店
+    * @return \shop_gold
+    */
+    public static function shop_gold()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_gold');
     }
-
     /**
-     * @return \sm_shop_gold shop_gold item数据
-     */
-    public static function shop_gold_getItem($itemid) {
+    * @return \sm_shop_gold shop_gold item数据 
+    */
+    public static function shop_gold_getItem($itemid)
+    { 
         return self::get_hash_item('shop_gold', $itemid);
     }
-
     /**
-     * 商城供给表-应该是废弃了
-     * @return \shop_supply
-     */
-    public static function shop_supply() {
-        static $a = null;
+    * 商城供给表-应该是废弃了
+    * @return \shop_supply
+    */
+    public static function shop_supply()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_supply');
     }
-
     /**
-     * @return \sm_shop_supply shop_supply item数据
-     */
-    public static function shop_supply_getItem($itemid) {
+    * @return \sm_shop_supply shop_supply item数据 
+    */
+    public static function shop_supply_getItem($itemid)
+    { 
         return self::get_hash_item('shop_supply', $itemid);
     }
-
     /**
-     * 词条配置表
-     * @return \predicate
-     */
-    public static function predicate() {
-        static $a = null;
+    * 词条配置表
+    * @return \predicate
+    */
+    public static function predicate()
+    { 
+        static $a = null; 
         return self::initValue($a, 'predicate');
     }
-
     /**
-     * @return \sm_predicate predicate item数据
-     */
-    public static function predicate_getItem($itemid) {
+    * @return \sm_predicate predicate item数据 
+    */
+    public static function predicate_getItem($itemid)
+    { 
         return self::get_hash_item('predicate', $itemid);
     }
-
     /**
-     * 商城军备
-     * @return \shop_junbei
-     */
-    public static function shop_junbei() {
-        static $a = null;
+    * 商城军备
+    * @return \shop_junbei
+    */
+    public static function shop_junbei()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_junbei');
     }
-
     /**
-     * @return \sm_shop_junbei shop_junbei item数据
-     */
-    public static function shop_junbei_getItem($itemid) {
+    * @return \sm_shop_junbei shop_junbei item数据 
+    */
+    public static function shop_junbei_getItem($itemid)
+    { 
         return self::get_hash_item('shop_junbei', $itemid);
     }
-
     /**
-     * 进化表
-     * @return \evolve
-     */
-    public static function evolve() {
-        static $a = null;
+    * 进化表
+    * @return \evolve
+    */
+    public static function evolve()
+    { 
+        static $a = null; 
         return self::initValue($a, 'evolve');
     }
-
     /**
-     * @return \sm_evolve evolve item数据
-     */
-    public static function evolve_getItem($itemid) {
+    * @return \sm_evolve evolve item数据 
+    */
+    public static function evolve_getItem($itemid)
+    { 
         return self::get_hash_item('evolve', $itemid);
     }
-
     /**
-     * 7日签到累计
-     * @return \active_day7_accumulate
-     */
-    public static function active_day7_accumulate() {
-        static $a = null;
+    * 7日签到累计
+    * @return \active_day7_accumulate
+    */
+    public static function active_day7_accumulate()
+    { 
+        static $a = null; 
         return self::initValue($a, 'active_day7_accumulate');
     }
-
     /**
-     * @return \sm_active_day7_accumulate active_day7_accumulate item数据
-     */
-    public static function active_day7_accumulate_getItem($itemid) {
+    * @return \sm_active_day7_accumulate active_day7_accumulate item数据 
+    */
+    public static function active_day7_accumulate_getItem($itemid)
+    { 
         return self::get_hash_item('active_day7_accumulate', $itemid);
     }
-
     /**
-     * 宝石表
-     * @return \gem
-     */
-    public static function gem() {
-        static $a = null;
+    * 宝石表
+    * @return \gem
+    */
+    public static function gem()
+    { 
+        static $a = null; 
         return self::initValue($a, 'gem');
     }
-
     /**
-     * @return \sm_gem gem item数据
-     */
-    public static function gem_getItem($itemid) {
+    * @return \sm_gem gem item数据 
+    */
+    public static function gem_getItem($itemid)
+    { 
         return self::get_hash_item('gem', $itemid);
     }
-
     /**
-     * 秘宝表
-     * @return \gate_sbox
-     */
-    public static function gate_sbox() {
-        static $a = null;
+    * 秘宝表
+    * @return \gate_sbox
+    */
+    public static function gate_sbox()
+    { 
+        static $a = null; 
         return self::initValue($a, 'gate_sbox');
     }
-
     /**
-     * @return \sm_gate_sbox gate_sbox itemArray
-     */
-    public static function gate_sbox_getItemArray($key) {
+    * @return \sm_gate_sbox gate_sbox itemArray 
+    */
+    public static function gate_sbox_getItemArray($key)
+    { 
         return self::get_hash_item('gate_sbox', $key);
     }
-
     /**
-     * 最新的成就
-     * @return \achieve_new
-     */
-    public static function achieve_new() {
-        static $a = null;
+    * 最新的成就
+    * @return \achieve_new
+    */
+    public static function achieve_new()
+    { 
+        static $a = null; 
         return self::initValue($a, 'achieve_new');
     }
-
     /**
-     * @return \sm_achieve_new achieve_new item数据
-     */
-    public static function achieve_new_getItem($itemid) {
+    * @return \sm_achieve_new achieve_new item数据 
+    */
+    public static function achieve_new_getItem($itemid)
+    { 
         return self::get_hash_item('achieve_new', $itemid);
     }
-
     /**
-     * 人物属性
-     * @return \heroattr
-     */
-    public static function heroattr() {
-        static $a = null;
+    * 人物属性
+    * @return \heroattr
+    */
+    public static function heroattr()
+    { 
+        static $a = null; 
         return self::initValue($a, 'heroattr');
     }
-
     /**
-     * @return \sm_heroattr heroattr item数据
-     */
-    public static function heroattr_getItem($itemid) {
+    * @return \sm_heroattr heroattr item数据 
+    */
+    public static function heroattr_getItem($itemid)
+    { 
         return self::get_hash_item('heroattr', $itemid);
     }
-
     /**
-     * 剧情对话
-     * @return \plots
-     */
-    public static function plots() {
-        static $a = null;
+    * 剧情对话
+    * @return \plots
+    */
+    public static function plots()
+    { 
+        static $a = null; 
         return self::initValue($a, 'plots');
     }
-
     /**
-     * @return \sm_plots plots item数据
-     */
-    public static function plots_getItem($itemid) {
+    * @return \sm_plots plots item数据 
+    */
+    public static function plots_getItem($itemid)
+    { 
         return self::get_hash_item('plots', $itemid);
     }
-
     /**
-     * 商城宝箱表
-     * @return \shop_box
-     */
-    public static function shop_box() {
-        static $a = null;
+    * 商城宝箱表
+    * @return \shop_box
+    */
+    public static function shop_box()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_box');
     }
-
     /**
-     * @return \sm_shop_box shop_box item数据
-     */
-    public static function shop_box_getItem($itemid) {
+    * @return \sm_shop_box shop_box item数据 
+    */
+    public static function shop_box_getItem($itemid)
+    { 
         return self::get_hash_item('shop_box', $itemid);
     }
-
     /**
-     * 商城月卡
-     * @return \shop_monthcard
-     */
-    public static function shop_monthcard() {
-        static $a = null;
+    * 商城月卡
+    * @return \shop_monthcard
+    */
+    public static function shop_monthcard()
+    { 
+        static $a = null; 
         return self::initValue($a, 'shop_monthcard');
     }
-
     /**
-     * @return \sm_shop_monthcard shop_monthcard item数据
-     */
-    public static function shop_monthcard_getItem($itemid) {
+    * @return \sm_shop_monthcard shop_monthcard item数据 
+    */
+    public static function shop_monthcard_getItem($itemid)
+    { 
         return self::get_hash_item('shop_monthcard', $itemid);
     }
-
     /**
-     * 7日狂欢活跃点奖励
-     * @return \activepointreward
-     */
-    public static function activepointreward() {
-        static $a = null;
+    * 7日狂欢活跃点奖励
+    * @return \activepointreward
+    */
+    public static function activepointreward()
+    { 
+        static $a = null; 
         return self::initValue($a, 'activepointreward');
     }
-
     /**
-     * @return \sm_activepointreward activepointreward item数据
-     */
-    public static function activepointreward_getItem($type, $pointId) {
+    * @return \sm_activepointreward activepointreward item数据 
+    */
+    public static function activepointreward_getItem($type, $pointId)
+    { 
         return self::get_hash_item('activepointreward', "$type-$pointId");
     }
-
     /**
-     * 活动任务
-     * @return \activeTask
-     */
-    public static function activeTask() {
-        static $a = null;
+    * 活动任务
+    * @return \activeTask
+    */
+    public static function activeTask()
+    { 
+        static $a = null; 
         return self::initValue($a, 'activeTask');
     }
-
     /**
-     * @return \sm_activeTask activeTask item数据
-     */
-    public static function activeTask_getItem($itemid) {
+    * @return \sm_activeTask activeTask item数据 
+    */
+    public static function activeTask_getItem($itemid)
+    { 
         return self::get_hash_item('activeTask', $itemid);
     }
-
     /**
-     * 活动任务根据类型的不同分开
-     * @return \activeTask_type
-     */
-    public static function activeTask_type() {
-        static $a = null;
+    * 活动任务根据类型的不同分开
+    * @return \activeTask_type
+    */
+    public static function activeTask_type()
+    { 
+        static $a = null; 
         return self::initValue($a, 'activeTask_type');
     }
-
     /**
-     * @return \sm_activeTask_type activeTask_type itemArray
-     */
-    public static function activeTask_type_getItemArray($key) {
+    * @return \sm_activeTask_type activeTask_type itemArray 
+    */
+    public static function activeTask_type_getItemArray($key)
+    { 
         return self::get_hash_item('activeTask_type', $key);
     }
-
     /**
-     * 活动
-     * @return \activity
-     */
-    public static function activity() {
-        static $a = null;
+    * 活动
+    * @return \activity
+    */
+    public static function activity()
+    { 
+        static $a = null; 
         return self::initValue($a, 'activity');
     }
-
     /**
-     * @return \sm_activity activity item数据
-     */
-    public static function activity_getItem($itemid) {
+    * @return \sm_activity activity item数据 
+    */
+    public static function activity_getItem($itemid)
+    { 
         return self::get_hash_item('activity', $itemid);
     }
-
     /**
-     * 公告
-     * @return \announcement
-     */
-    public static function announcement() {
-        static $a = null;
+    * 公告
+    * @return \announcement
+    */
+    public static function announcement()
+    { 
+        static $a = null; 
         return self::initValue($a, 'announcement');
     }
-
     /**
-     * @return \sm_announcement announcement item数据
-     */
-    public static function announcement_getItem($itemid) {
+    * @return \sm_announcement announcement item数据 
+    */
+    public static function announcement_getItem($itemid)
+    { 
         return self::get_hash_item('announcement', $itemid);
     }
-
     /**
-     * 战力荣誉榜信息
-     * @return \rank_fightpowerreward
-     */
-    public static function rank_fightpowerreward() {
-        static $a = null;
+    * 战力荣誉榜信息
+    * @return \rank_fightpowerreward
+    */
+    public static function rank_fightpowerreward()
+    { 
+        static $a = null; 
         return self::initValue($a, 'rank_fightpowerreward');
     }
-
     /**
-     * @return \sm_rank_fightpowerreward rank_fightpowerreward item数据
-     */
-    public static function rank_fightpowerreward_getItem($itemid) {
+    * @return \sm_rank_fightpowerreward rank_fightpowerreward item数据 
+    */
+    public static function rank_fightpowerreward_getItem($itemid)
+    { 
         return self::get_hash_item('rank_fightpowerreward', $itemid);
     }
-
     /**
-     * 主线荣誉榜信息
-     * @return \rank_passgatereward
-     */
-    public static function rank_passgatereward() {
-        static $a = null;
+    * 主线荣誉榜信息
+    * @return \rank_passgatereward
+    */
+    public static function rank_passgatereward()
+    { 
+        static $a = null; 
         return self::initValue($a, 'rank_passgatereward');
     }
-
     /**
-     * @return \sm_rank_passgatereward rank_passgatereward item数据
-     */
-    public static function rank_passgatereward_getItem($itemid) {
+    * @return \sm_rank_passgatereward rank_passgatereward item数据 
+    */
+    public static function rank_passgatereward_getItem($itemid)
+    { 
         return self::get_hash_item('rank_passgatereward', $itemid);
     }
-
     /**
-     * 玩家等级表
-     * @return \player_level
-     */
-    public static function player_level() {
-        static $a = null;
+    * 玩家等级表
+    * @return \player_level
+    */
+    public static function player_level()
+    { 
+        static $a = null; 
         return self::initValue($a, 'player_level');
     }
-
     /**
-     * @return \sm_player_level player_level item数据
-     */
-    public static function player_level_getItem($itemid) {
+    * @return \sm_player_level player_level item数据 
+    */
+    public static function player_level_getItem($itemid)
+    { 
         return self::get_hash_item('player_level', $itemid);
     }
-
     /**
-     *  辅助:主线剧情解锁
-     * @return \gate_unlock
-     */
-    public static function gate_unlock() {
-        static $a = null;
+    *  辅助:主线剧情解锁
+    * @return \gate_unlock
+    */
+    public static function gate_unlock()
+    { 
+        static $a = null; 
         return self::initValue($a, 'gate_unlock');
     }
-
     /**
-     * @return \sm_gate_unlock gate_unlock itemArray
-     */
-    public static function gate_unlock_getItemArray($key) {
+    * @return \sm_gate_unlock gate_unlock itemArray 
+    */
+    public static function gate_unlock_getItemArray($key)
+    { 
         return self::get_hash_item('gate_unlock', $key);
     }
-
     /**
-     * 辅助: 波次直查
-     * @return \waveItem
-     */
-    public static function waveItem() {
-        static $a = null;
+    * 辅助: 波次直查
+    * @return \waveItem
+    */
+    public static function waveItem()
+    { 
+        static $a = null; 
         return self::initValue($a, 'waveItem');
     }
-
     /**
-     * @return \sm_waveItem waveItem item数据
-     */
-    public static function waveItem_getItem($gateId, $waveId) {
+    * @return \sm_waveItem waveItem item数据 
+    */
+    public static function waveItem_getItem($gateId, $waveId)
+    { 
         return self::get_hash_item('waveItem', "$gateId-$waveId");
     }
-
     /**
-     * 当前版本(时间戳)
-     * @return \ver
-     */
-    public static function ver() {
-        static $a = null;
+    * 道具宝箱表
+    * @return \item_2023_box
+    */
+    public static function item_2023_box()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'item_2023_box');
+    }
+    /**
+    * @return \sm_item_2023_box item_2023_box item数据 
+    */
+    public static function item_2023_box_getItem($itemid)
+    { 
+        return self::get_hash_item('item_2023_box', $itemid);
+    }
+    /**
+    * 当前版本(时间戳)
+    * @return \ver
+    */
+    public static function ver()
+    { 
+        static $a = null; 
         return self::initValue($a, 'ver', false);
     }
-
     /**
-     * 客户端配置数据
-     * @return \client
-     */
-    public static function client() {
-        static $a = null;
+    * 客户端配置数据
+    * @return \client
+    */
+    public static function client()
+    { 
+        static $a = null; 
         return self::initValue($a, 'client', false);
     }
 }
+

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-06-07 10:54:59
+ // 日期: 2024-06-07 15:50:47
 ////////////////////
 
 /**
@@ -685,6 +685,22 @@ class GameConfig {
         return self::get_hash_item('waveItem', "$gateId-$waveId");
     }
     /**
+    * 道具宝箱表
+    * @return \item_2023_box
+    */
+    public static function item_2023_box()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'item_2023_box');
+    }
+    /**
+    * @return \sm_item_2023_box item_2023_box item数据 
+    */
+    public static function item_2023_box_getItem($itemid)
+    { 
+        return self::get_hash_item('item_2023_box', $itemid);
+    }
+    /**
     * 当前版本(时间戳)
     * @return \ver
     */

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-06-07 10:50:44
+ // 日期: 2024-06-07 15:05:45
 ////////////////////
 
 

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-06-06 15:47:13
+ // 日期: 2024-06-07 15:42:28
 ////////////////////
 
 

+ 47 - 0
Gameserver/App/model/Const/sm_item_2023_box.php

@@ -0,0 +1,47 @@
+<?php
+////////////////////
+ // 由CodeGenerator创建。
+ // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
+ // author: gwang 
+ // 日期: 2024-06-07 14:15:10
+////////////////////
+
+
+/**
+ * Static Model item_2023_box 道具宝箱表
+ */
+class sm_item_2023_box
+{
+
+    /**
+    * @var Int32 用途未知!!请到数据库中添加字段注释。  
+    */
+    public $id;
+
+    /**
+    * @var Int32 实例id  
+    */
+    public $typeId;
+
+    /**
+    * @var String 宝箱名称  
+    */
+    public $name;
+
+    /**
+    * @var Int32 宝箱类型 随机:1   固定 2  
+    */
+    public $type;
+
+    /**
+    * @var String 宝箱里内容信息  
+    */
+    public $contents;
+
+    /**
+    * @var String 宝箱描述信息  
+    */
+    public $desc;
+
+}
+

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-06-07 10:11:04
+ // 日期: 2024-06-07 14:35:45
 ////////////////////
 
 

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

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-06-07 10:11:04
+ // 日期: 2024-06-07 14:35:45
 ////////////////////
 
 

+ 85 - 85
Gameserver/App/process/FightProc.php

@@ -62,7 +62,7 @@ class FightProc {
      */
     public static function FightSweep() {
         //list($gateId) = req()->paras;
-        
+
         $passGateId = ctx()->gates->maxPassGateId();
         my_Assert($passGateId != 0, ErrCode::gate_NoSweep);
         //$mo = GameConfig::gate_getItem(ctx()->gates->UnlockedGatesMaxId);
@@ -73,33 +73,33 @@ class FightProc {
         ctx()->gates->fightSweepNum += 1;
         ctx()->baseInfo->Consume_tili($costTili);
         $prizeArr = array();
-        
+
         $wavesArr = GameConfig::waves_getItemArray($passGateId);
         $count = count($wavesArr);
-        $wavesMo = $wavesArr[$count-1];
-        
-        ctx()->baseInfo->Add_Gold($wavesMo->rewardGold); 
+        $wavesMo = $wavesArr[$count - 1];
+
+        ctx()->baseInfo->Add_Gold($wavesMo->rewardGold);
         $gold = $wavesMo->rewardGold;
-        $prizeArr[] = "1,".$gold;
-           
+        $prizeArr[] = "1," . $gold;
+
         $exp = $wavesMo->rewardExp;
-        $prizeArr[] = "1,".$exp;
+        $prizeArr[] = "1," . $exp;
         ctx()->baseInfo->Add_Exp($exp);
         if ($wavesMo->rewardTuZhi != null) {
             $tuzhi = explode('-', $wavesMo->rewardTuZhi);
-            $n = rand($tuzhi[0],$tuzhi[1]);
-            
+            $n = rand($tuzhi[0], $tuzhi[1]);
+
             $tuzhiArr = array();
             $item = GameConfig::item();
             foreach ($item as $id => $mo) {
-                if($mo->itemType == 100){
+                if ($mo->itemType == 100) {
                     $tuzhiArr[] = $id;
                 }
             }
-            
-            $index = rand(0,count($tuzhiArr)-1);                      
-            $goodsStr = $tuzhiArr[$index].','.$n;
-            
+
+            $index = rand(0, count($tuzhiArr) - 1);
+            $goodsStr = $tuzhiArr[$index] . ',' . $n;
+
             $prizeArr[] = $goodsStr;
             StoreProc::AddMultiItemInStore($goodsStr);
         }
@@ -120,7 +120,7 @@ class FightProc {
             }
         }
 
-       
+
         UserProc::updateUserInfo();
         $ret = array(
             'tili' => ctx()->baseInfo->tili,
@@ -137,23 +137,23 @@ class FightProc {
         $numArr = explode('-', $ctxArr[0]);
         $num = rand($numArr[0], $numArr[1]);
 
-      
+
         $rand = 0;
         $itemArr = explode(',', $ctxArr[1]);
         foreach ($itemArr as $value) {
             $arr = explode(':', $value);
             $itemId = $arr[0];
             $per = $arr[1];
-            
-            $rand+=$per;
+
+            $rand += $per;
         }
-        
+
         $randNum = rand(1, $rand);
         $start = 0;
         $end = 0;
 
         $res = "";
-        
+
         foreach ($itemArr as $str) {
             $arr = explode(':', $str);
             $itemId = $arr[0];
@@ -733,22 +733,22 @@ class FightProc {
     public static function Ranking_MainGateIndex($maxGateIndex) {
         $memKey = MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid);
         $mem = gMem();
-        
-        $index = 9999999999- now();        
-        $uid = $index."-".req()->uid;
+
+        $index = 9999999999 - now();
+        $uid = $index . "-" . req()->uid;
         $arr = self::GetRankUid(req()->uid, 1);
         $gateId = 0;
-        if(count($arr) > 0){
+        if (count($arr) > 0) {
             $uid = $arr[0];
             $gateId = $arr[1];
-        }     
-        
-        if($maxGateIndex > $gateId){
+        }
+
+        if ($maxGateIndex > $gateId) {
             $arr2 = array();
             $arr2["$uid"] = $maxGateIndex;
             $mem->zadd($memKey, $arr2);
         }
-             
+
         $length = $mem->zlen($memKey);
         if ($length > glc()->Rank_MainGateIndex_OnListRank) {
             $num = $length - glc()->Rank_MainGateIndex_OnListRank;
@@ -763,17 +763,17 @@ class FightProc {
     public static function Ranking_FightPower() {
         $memKey = MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid);
         $mem = gMem();
-        
-        $index = 9999999999- now();
-        $uid = $index."-".req()->uid;       
+
+        $index = 9999999999 - now();
+        $uid = $index . "-" . req()->uid;
         $lastPower = 0;
-        $arr = self::GetRankUid(req()->uid,2);
-        if(count($arr) > 0){
+        $arr = self::GetRankUid(req()->uid, 2);
+        if (count($arr) > 0) {
             $uid = $arr[0];
             $lastPower = $arr[1];
-        } 
-        
-        $power = self::countUserFightPower();        
+        }
+
+        $power = self::countUserFightPower();
         if ($power > $lastPower) {
             $arr2["$uid"] = $power;
             $mem->zadd($memKey, $arr2);
@@ -786,25 +786,24 @@ class FightProc {
             $mem->zremrangebyrank($memKey, 0, $num - 1);
         }
     }
-    
-    public static function GetRankUid($uid_rank,$type) {
-        if($type == 1){
-            $dic = gMem()->zrevrange(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), 0, glc()->Rank_MainGateIndex_OnListRank,true);
+
+    public static function GetRankUid($uid_rank, $type) {
+        if ($type == 1) {
+            $dic = gMem()->zrevrange(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), 0, glc()->Rank_MainGateIndex_OnListRank, true);
         } else {
-            $dic = gMem()->zrevrange(MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid), 0, glc()->Rank_FightPower_OnListRank,true);
+            $dic = gMem()->zrevrange(MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid), 0, glc()->Rank_FightPower_OnListRank, true);
         }
-        
+
         $arr = array();
         foreach ($dic as $uid => $score) {
             $strUid = explode('-', $uid);
-            if($strUid[1] == $uid_rank){
+            if ($strUid[1] == $uid_rank) {
                 $arr[] = $uid;
                 $arr[] = $score;
                 break;
             }
         }
         return $arr;
-        
     }
 
     /**
@@ -842,11 +841,11 @@ class FightProc {
                 }
             }
         }
-        
+
         $selfRank = null;
         $retArr = array();
         if (count($list) > 0) {
-            foreach ($list as $uid => $score) {          
+            foreach ($list as $uid => $score) {
                 $rankInfo = self::initOtherUidRankInfo($uid, $score, $type);
                 if ($rankInfo->uid == req()->uid) {
                     $selfIsHasRank = 1;
@@ -856,10 +855,10 @@ class FightProc {
                 $retArr[] = $rankInfo;
             }
         }
-        
-        if($selfRank == null){
-            $index = 9999999999- now();
-            $uid = $index."-".req()->uid;
+
+        if ($selfRank == null) {
+            $index = 9999999999 - now();
+            $uid = $index . "-" . req()->uid;
             $selfRank = self::initOtherUidRankInfo($uid, $selfExtraInfo, $type);
         }
 
@@ -885,13 +884,13 @@ class FightProc {
         if ($type == 1) {
             $lv = gMem()->zrevrank(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), $uid);
         } else {
-            $lv = gMem()->zrevrank(MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid),$uid);
+            $lv = gMem()->zrevrank(MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid), $uid);
         }
 
         if ($lv == null) {
             $lv = 0;
         }
-        
+
         $strUid = explode('-', $uid);
         $ins_rank->rank = $lv + 1;
         $ins_rank->uid = $strUid[1];
@@ -972,8 +971,8 @@ class FightProc {
 
         $memKey = MemKey_GameRun::RankReward_MainGateIndex_Zone_hash(req()->zoneid);
         $dic = gMem()->hgetall($memKey);
-        
-        if($dic == null){
+
+        if ($dic == null) {
             $dic = new \stdClass();
         }
 
@@ -994,10 +993,10 @@ class FightProc {
         $memKey = MemKey_GameRun::RankReward_FightPower_Zone_hash(req()->zoneid);
         $dic = gMem()->hgetall($memKey);
 
-        if($dic == null){
+        if ($dic == null) {
             $dic = new \stdClass();
         }
-        
+
         UserProc::updateUserInfo();
         $ret = array(
             'rankReward' => $dic,
@@ -1050,37 +1049,39 @@ class FightProc {
         $ret = array();
         return Resp::ok($ret);
     }
-    
+
     /**
      * 6817
      */
     public static function IsExistRankReward() {
-        list($type) = req()->paras;
+        //list($type) = req()->paras;
 
+        $type = 0;
         $isExistFinishReward = false;
-        if ($type == 1) {          
-            $memKey = MemKey_GameRun::RankReward_MainGateIndex_Zone_hash(req()->zoneid);
-            $dic = gMem()->hgetall($memKey);
-            foreach ($dic as $gateId => $ins_rank) {
-                if (!in_array($gateId, ctx()->privateState->rankReward_drawed_MainGate)) {
-                    $isExistFinishReward = true;
-                    break;
-                }
+        $memKey = MemKey_GameRun::RankReward_MainGateIndex_Zone_hash(req()->zoneid);
+        $dic = gMem()->hgetall($memKey);
+        foreach ($dic as $gateId => $ins_rank) {
+            if (!in_array($gateId, ctx()->privateState->rankReward_drawed_MainGate)) {
+                $isExistFinishReward = true;
+                $type = 1;
+                break;
             }
-        } else {       
-            $memKey = MemKey_GameRun::RankReward_FightPower_Zone_hash(req()->zoneid);
-            $dic = gMem()->hgetall($memKey);
-            foreach ($dic as $fightPower => $ins_rank) {
-                if (!in_array($fightPower, ctx()->privateState->rankReward_drawed_fightPower)) {
-                    $isExistFinishReward = true;
-                    break;
-                }
+        }
+
+        $memKey2 = MemKey_GameRun::RankReward_FightPower_Zone_hash(req()->zoneid);
+        $dic2 = gMem()->hgetall($memKey2);
+        foreach ($dic2 as $fightPower => $ins_rank) {
+            if (!in_array($fightPower, ctx()->privateState->rankReward_drawed_fightPower)) {
+                $isExistFinishReward = true;
+                $type = 2;
+                break;
             }
         }
 
         UserProc::updateUserInfo();
         $ret = array(
             'isExistFinishReward' => $isExistFinishReward,
+            'type'=>$type,
         );
         return Resp::ok($ret);
     }
@@ -1089,33 +1090,32 @@ class FightProc {
      * 删除排行榜内注销账号的玩家
      */
 
-    public static function DeleteRankInvalidUser($uid2) {     
-        $dic1 = gMem()->zrevrangebyscore(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), 0, glc()->Rank_MainGateIndex_OnListRank,true);
+    public static function DeleteRankInvalidUser($uid2) {
+        $dic1 = gMem()->zrevrangebyscore(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), 0, glc()->Rank_MainGateIndex_OnListRank, true);
         $key1 = "";
         foreach ($dic1 as $uid => $score) {
             $strUid = explode('-', $uid);
-            if($strUid[1] == $uid2){
+            if ($strUid[1] == $uid2) {
                 $key1 = $uid;
                 break;
             }
         }
-    
-        $dic2 = gMem()->zrevrangebyscore(MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid), 0, glc()->Rank_FightPower_OnListRank,true);
+
+        $dic2 = gMem()->zrevrangebyscore(MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid), 0, glc()->Rank_FightPower_OnListRank, true);
         $key2 = "";
         foreach ($dic2 as $uid => $score) {
             $strUid = explode('-', $uid);
-            if($strUid[1] == $uid2){
+            if ($strUid[1] == $uid2) {
                 $key2 = $uid;
                 break;
             }
         }
-        if($key1 != ""){
-            gMem()->zrem(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid),$key1);
+        if ($key1 != "") {
+            gMem()->zrem(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), $key1);
         }
-        if($key1 != ""){
+        if ($key1 != "") {
             gMem()->zrem(MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid), $key2);
         }
-              
     }
 
     /*

+ 91 - 33
Gameserver/App/process/StoreProc.php

@@ -245,7 +245,7 @@ class StoreProc {
         TaskProc::OnAllEquipUpLevel_X();
         TaskProc::OnEquipLevelUpNum();
         ctx($user);
-        
+
         FightProc::Ranking_FightPower();
         UserProc::updateUserInfo();
         return Resp::ok(array(
@@ -559,7 +559,7 @@ class StoreProc {
         $user->store->gemEquip->$pag->$posId = $dic;
 
         TaskProc::OnSetSpecialQualGem();
-        
+
         FightProc::Ranking_FightPower();
         ctx($user);
         UserProc::updateUserInfo();
@@ -601,7 +601,7 @@ class StoreProc {
             //$user->store->gemStore->$uid = $tag_gem;
         }
         ctx($user);
-        
+
         FightProc::Ranking_FightPower();
         UserProc::updateUserInfo();
         return Resp::ok(array(
@@ -635,7 +635,7 @@ class StoreProc {
         TaskProc::OnAnyEquipUpLevel_X();
         TaskProc::OnAllEquipUpLevel_X();
         TaskProc::OnEquipLevelUpNum();
-        
+
         FightProc::Ranking_FightPower();
         ctx($user);
         UserProc::updateUserInfo();
@@ -692,7 +692,7 @@ class StoreProc {
         TaskProc::OnAnyEquipUpLevel_X();
         TaskProc::OnAllEquipUpLevel_X();
         TaskProc::OnEquipLevelUpNum();
-        
+
         FightProc::Ranking_FightPower();
         ctx($user);
         UserProc::updateUserInfo();
@@ -733,36 +733,40 @@ class StoreProc {
             $val = explode(",", $value);
             my_Assert(count($val) > 1, "解析奖励字符串出错");
 
-            list($itemId, $num) = $val;                                         # ID, 数量
-            if (GameConfig::gem_getItem($itemId) != null) {
-                self::PutGemInStore($itemId, $num);
-            } else {
-                $itemMo = GameConfig::item_getItem($itemId);
-                switch ($itemMo->itemType) {
-                    case 1:
-                        ctx()->baseInfo->Add_Gold($num);
+            list($itemId, $num) = $val;                                         # ID, 数量           
+            $itemMo = GameConfig::item_getItem($itemId);
+            switch ($itemMo->itemType) {
+                case 1:
+                    ctx()->baseInfo->Add_Gold($num);
+                    self::checkEquipUpgradeTip();
+                    break;
+                case 2:
+                    ctx()->baseInfo->Add_Cash($num);
+                    break;
+                case 3:
+                    ctx()->baseInfo->Add_tili($num);
+                    break;
+                case 4:
+                    ctx()->baseInfo->Add_Exp($num);
+                    break;
+                case 100://图纸
+                case 401://启灵石
+                case 301://洗练石
+                    //case 103:
+                    self::PutItemsInStore($itemId, $num);
+                    if ($itemMo->itemType == 100) {//图纸
                         self::checkEquipUpgradeTip();
-                        break;
-                    case 2:
-                        ctx()->baseInfo->Add_Cash($num);
-                        break;
-                    case 3:
-                        ctx()->baseInfo->Add_tili($num);
-                        break;
-                    case 4:
-                        ctx()->baseInfo->Add_Exp($num);
-                        break;
-                    case 100:
-                    case 103:
-                        self::PutItemsInStore($itemId, $num);
-                        if ($itemMo->itemType == 100) {//图纸
-                            self::checkEquipUpgradeTip();
-                        }
-                        break;
-                    default:
+                    }
+                    break;
+                case 201://宝石                      
+                    self::PutGemInStore($itemId, $num);
+                    break;
+                case 701://道具宝箱
+                    self::DistributeItemsBox($itemId);
+                    break;
+                default:
 
-                        break;
-                }
+                    break;
             }
         }
     }
@@ -778,6 +782,60 @@ class StoreProc {
         ctx()->store->items = $items;
     }
 
+    /**
+     * 拆分宝箱盒子
+     * @param type $reward
+     */
+    public static function DistributeItemsBox($itemId) {
+        $itemBoxMo = GameConfig::item_2023_box_getItem($itemId);
+        my_Assert($itemBoxMo != null, ErrCode::err_const_no);
+        if ($itemBoxMo->type == 1) {
+            $strList = explode(';', $itemBoxMo->contents);
+            $numList = explode('-', $strList[0]);
+            $randNum = rand($numList[0], $numList[1]);
+
+            $ctxList = explode(',', $strList[1]);
+            $per = 0;
+            foreach ($ctxList as $value) {
+                $ctx = explode(':', $value);
+                $per += $ctx[1];
+            }
+
+            $reward = "";
+            for ($i = 0; $i < $randNum; $i++) {
+                $ctxPer = rand(1, $per);
+                $start = 0;
+                $end = 0;
+
+                $id = 0;
+                foreach ($ctxList as $value) {
+                    $ctx = explode(':', $value);
+                    $per += $ctx[1];
+
+                    $end += $per;
+                    if ($ctxPer > $start && $ctxPer <= $end) {
+                        $id = $ctx[0];
+                        break;
+                    }
+                    $start = $end;
+                }
+
+                if ($id != 0) {
+                    $str = $id . ',1';
+                    if ($reward == "") {
+                        $reward = $str;
+                    } else {
+                        $reward = $reward . ';' . $str;
+                    }
+                }
+            }
+
+            self::AddMultiItemInStore($reward);
+        } else {
+            self::AddMultiItemInStore($itemBoxMo->contents);
+        }
+    }
+
 //    public static function PutEquipInStore($equipId, $num) {
 //        if ($equipId == 0) {
 //            return;