gwang 4 سال پیش
والد
کامیت
453eb496a7

+ 0 - 1
Gameserver/Amfphp/AutoLoad.php

@@ -53,6 +53,5 @@ require_once ROOTDIR . '/process/EventProc/CornerSignEventProc.php';
 require_once ROOTDIR . '/model/User/UserInfoMo.php';                            # 玩家全部数据模型
 require_once ROOTDIR . '/model/User/UserGameModel.php';                         # 游戏数据
 require_once ROOTDIR . '/model/User/UserProfile.php';                           # 玩家画像
-require_once ROOTDIR . '/model/User/GuildModel.php';
 
 AutoLoad::Init();                                                              // 直接执行初始化

+ 0 - 342
Gameserver/Amfphp/model/User/GuildModel.php

@@ -1,342 +0,0 @@
-<?php
-
-namespace loyalsoft;
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- * Description of GuildModel
- *
- * @author cyzhao
- */
-class GuildModel
-{
-
-    /**
-     * 公会的ID
-     * @var int
-     */
-    public $guildId;
-
-    /**
-     * 公会名称
-     * @var string
-     */
-    public $name;
-
-    /**
-     * 公会的等级
-     * @var int
-     */
-    public $level = 1;
-
-    /**
-     * 奖杯积分
-     * @var int
-     */
-    public $cupScore = 0;
-
-    /**
-     * 玩家申请加入公会列表
-     * @var object
-     */
-    public $applylist;
-
-    /**
-     * 会长的OpenID
-     * @var string
-     */
-    public $chairman_id = "";
-
-    /**
-     * 会长 name
-     * @var string
-     */
-    public $chairman_name = "";
-
-    /**
-     * @var array 副会长集合
-     */
-    public $viceChairManArr = array();
-
-    /**
-     * @var array 干部
-     */
-    public $officerManArr = array();
-
-    /**
-     * 公会成员
-     * @var array
-     */
-    public $members = array();
-
-    /**
-     * 公会的宗旨/公告
-     * @var string
-     */
-    public $declare = "";
-
-    /**
-     * 创建时间戳
-     * @var type
-     */
-    public $createts = 0;
-
-    /**
-     * 允许一键(快速)加入, 默认不开启
-     * @var int
-     */
-    public $enableQuickIn = 0; //默认允许任何人加入; 1是需要申请;2不允许任何人加入公会
-
-    /**
-     * 徽章
-     * @var int
-     */
-    public $guild_img = 0;
-
-    /**
-     * 加入公会所需条件
-     * @var int
-     */
-    public $condition;
-
-    /**
-     * 弹劾 同意
-     * @var type
-     */
-    public $accuse_agreed = array();
-
-    /**
-     * 弹劾 拒接
-     *  @var type
-     */
-    public $accuse_refuse = array();
-
-    /**
-     * 弹劾 时间
-     * @var int
-     */
-    public $accuseTs = 0;
-
-    /**
-     * 弹劾 冷却时间
-     * @var int
-     */
-    public $accuse_coolTime = 0;
-
-    /**
-     * 公会总贡献
-     * @var int
-     */
-    public $allContribute = 0;
-
-    /**
-     * 公会公告编辑冷却时间
-     * @var int
-     */
-    public $announcement_CoolingTs = 0;
-
-    /**
-     * 公会公告内容
-     * @var type
-     */
-    public $announcement_content = array();
-
-    /**
-     * 公会礼包购买数量记录
-     * @var type
-     */
-    public $giftnum_record;
-
-    /**
-     * 创建新公会
-     * @param type $mem
-     * @return GuildModel
-     */
-    public static function NewGuildInit($mem, $zoneid)
-    {
-
-        $guildid = self::CreateNewGuildID($mem, $zoneid);
-
-        $guildInfo = new GuildModel();
-        $guildInfo->guildId = $guildid;
-        $guildInfo->createts = now();
-        $guildInfo->members = array();
-        $guildInfo->level = 1;
-        $guildInfo->cupScore = 0;
-        $guildInfo->applylist = ObjectInit();
-        $guildInfo->condition = ObjectInit();
-        $guildInfo->giftnum_record = ObjectInit();
-        return $guildInfo;
-    }
-
-    static function CreateNewGuildID($mem, $zoneid)
-    {
-        $i = 0;
-        while (true) {
-            if ($mem->add(MemKey_Guild::constCreateGuildIDLock(), "V")) {
-                $guildid = $mem->get(MemKey_Guild::constGetCurrentMaxGuildID($zoneid));
-                if ($guildid == null) {
-                    $guildid = GUILDIDBASE;
-                }
-                $guildid += 1;
-                $mem->set(MemKey_Guild::constGetCurrentMaxGuildID($zoneid), $guildid);
-                $mem->delete(MemKey_Guild::constCreateGuildIDLock());
-                return $guildid;
-            } else {
-                if ($i++ > 10)
-                    return 0;
-                usleep(13); // 休息13微妙
-            }
-        }
-    }
-
-}
-
-/**
- * 玩家请求加入公会的消息结构体
- */
-class UserApplyForGuildModel
-{
-
-    public $uid;
-    public $ts;
-    public $approved = false;
-    public $name;
-    public $level;
-
-    /**
-     * 创建一条新的请求信息
-     * @param type $oid
-     * @return UserApplyForGuildModel Description
-     */
-    public static function CreateApplyInfo($uid, $name, $level)
-    {
-        $ret = new UserApplyForGuildModel();
-        $ret->uid = $uid;
-        $ret->ts = now();
-        $ret->name = $name;
-        $ret->level = $level;
-        $ret->approved = false;
-
-        return $ret;
-    }
-
-}
-
-/**
- * 公会值日消息类型
- */
-class GuildJournalType
-{
-
-    const Join = 1; //加入
-    const requestDonate = 2; //请求捐献
-    const Quit = 3; //退会
-    const ChangeChairMan = 4; //改变会长
-    const BuyGift = 5; //购买礼包
-
-}
-
-/**
- * 公会日志数据体
- */
-class GuildJournalModel
-{
-
-    public $ts;
-    public $uid;
-    public $type;
-    public $datas;
-
-    public static function CreateJoin($uid, $name)
-    {
-        $journal = new GuildJournalModel();
-        $journal->ts = now();
-        $journal->type = GuildJournalType::Join;
-        $journal->uid = $uid;
-        $journal->datas = array();
-        $journal->datas [] = $uid;
-        $journal->datas [] = $name;
-        return $journal;
-    }
-
-    public static function RequestDonate($uid, $name, $cardId, $cardCount)
-    {
-        $journal = new GuildJournalModel();
-        $journal->ts = now();
-        $journal->type = GuildJournalType::requestDonate;
-        $journal->uid = $uid;
-        $journal->datas = array();
-        $journal->datas [] = $uid;
-        $journal->datas [] = $name;
-        $journal->datas [] = $cardId;
-        $journal->datas [] = $cardCount;
-        $journal->datas [] = 0; //现在已得到的捐献数量
-        return $journal;
-    }
-
-    public static function CreateQuit($uid, $name)
-    {
-        $journal = new GuildJournalModel();
-        $journal->ts = now();
-        $journal->type = GuildJournalType::Quit;
-        $journal->uid = $uid;
-        $journal->datas = array();
-        $journal->datas [] = $uid;
-        $journal->datas [] = $name;
-        return $journal;
-    }
-
-    public static function CreateChangeChairman($uid, $name, $transferedid, $transferedname)
-    {
-        $journal = new GuildJournalModel();
-        $journal->ts = now();
-        $journal->type = GuildJournalType::ChangeChairMan;
-        $journal->uid = $uid;
-        $journal->datas = array();
-        $journal->datas [] = $uid;
-        $journal->datas [] = $name;
-        $journal->datas [] = $transferedid;
-        $journal->datas [] = $transferedname;
-        return $journal;
-    }
-
-    public static function BuyGift($uid, $name)
-    {
-        $journal = new GuildJournalModel();
-        $journal->ts = now();
-        $journal->type = GuildJournalType::BuyGift;
-        $journal->uid = $uid;
-        $journal->datas = array();
-        $journal->datas [] = $uid;
-        $journal->datas [] = $name;
-
-        return $journal;
-    }
-
-}
-
-class GuildAnnouncementModel extends Object_ext
-{
-
-    public $ts;
-    public $title;
-    public $content;
-
-    function __construct($tag, $ts, $title, $content)
-    {
-        if (1 == func_num_args() && $tag) { # 默认的Object初始化方法
-            parent::__construct($tag);
-        } else {
-            $this->ts = $ts;
-            $this->title = $title;
-            $this->content = $content;
-        }
-    }
-
-}

+ 1 - 0
Gameserver/Amfphp/process/HeroDiscussProc.php

@@ -1,5 +1,6 @@
 <?php
 
+// 这个功能个人觉着写的还不错, 代码就不删除了. 留着参考. --gwang
 //
 //namespace loyalsoft;
 //

+ 10 - 0
Gameserver/nbproject/private/private.xml

@@ -12,7 +12,17 @@
     </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/test.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/RankProc.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/Services/AppServer.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/UserPVPModel.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/GuildModel.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/index.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/SystemProc.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/process/TaskProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/AutoLoad.php</file>
         </group>
     </open-files>
 </project-private>