From ef31ad38399d5c9a3f6a52f42aa4bdba8adb31ad Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 21 二月 2025 01:40:57 +0800
Subject: [PATCH] 10349 【越南】【英文】【BT】【砍树】跨服竞技场优化
---
System/CrossServerOneVsOneClient/ClientCrossServerOneVsOne.cs | 77 ++++----------------------------------
1 files changed, 9 insertions(+), 68 deletions(-)
diff --git a/System/CrossServerOneVsOneClient/ClientCrossServerOneVsOne.cs b/System/CrossServerOneVsOneClient/ClientCrossServerOneVsOne.cs
index 61782f0..7887970 100644
--- a/System/CrossServerOneVsOneClient/ClientCrossServerOneVsOne.cs
+++ b/System/CrossServerOneVsOneClient/ClientCrossServerOneVsOne.cs
@@ -3,14 +3,13 @@
using UnityEngine;
using vnxbqy.UI;
using System;
-using System.Text.RegularExpressions;
using LitJson;
using System.Text;
public class ClientCrossServerOneVsOne
{
public const int mapId = 1000;
- public const uint OPPONENT_PLAYERID = 999999;
+ public static uint OPPONENT_PLAYERID;
public static bool isClientCrossServerOneVsOne { get; private set; }
public static FightResultSupplement resultSupplement;
@@ -44,50 +43,10 @@
}
}
- public static bool TryClientCrossServerOneVsOne(int myClass)
- {
- var config = CrossServerArenaConfig.Get(myClass);
- if (config == null)
- {
- return false;
- }
-
- if (config.robotProbability <= 0)
- {
- return false;
- }
-
- var random = UnityEngine.Random.Range(0, 100);
- return random < config.robotProbability;
- }
public static string GetRandomOpponentName(int job)
{
- var serverName = string.Empty;
- while (string.IsNullOrEmpty(serverName))
- {
- try
- {
- var groupRandom = UnityEngine.Random.Range(0, ServerListCenter.Instance.serverInfoCommon.common.Length);
- var serverRandom = UnityEngine.Random.Range(0, ServerListCenter.Instance.serverInfoCommon.common[groupRandom].group_list.Length);
- var serverData = ServerListCenter.Instance.serverInfoCommon.common[groupRandom].group_list[serverRandom];
-
- if (serverData.running_status == (int)ServerState.Normal
- || serverData.running_status == (int)ServerState.Busy
- || serverData.running_status == (int)ServerState.Hot)
- {
- serverName = serverData.name;
- }
- }
- catch (System.Exception ex)
- {
- Debug.LogError(ex);
- }
- }
-
- var playerName = StringUtility.Contact(RandomNameConfig.GetFirstName(job), RandomNameConfig.GetSecondName(job));
-
- return string.Concat("[", serverName.Replace("@gm", ""), "]", playerName);
+ return StringUtility.Contact(RandomNameConfig.GetFirstName(job), RandomNameConfig.GetSecondName(job));
}
public static GA_PlayerClient.PlayerInfo GetRandomOpponentPlayerInfo(int scoreClass, int job, string playerName, int level, ulong maxHp)
@@ -130,37 +89,18 @@
return playerInfo;
}
- //鏀逛负鐩存帴鎸戞垬鏈哄櫒浜�
- public static void JiaMatchOk()
+ //鎸戞垬鏈哄櫒浜� ID鍥哄畾涓� 1-瀵瑰簲楂樺垎娈垫満鍣ㄤ汉锛�2-涓垎娈碉紝3-浣庡垎娈�
+ public static void JiaMatchOk(HC001_tagGCCrossRealmPKMatchOK.tagGCCrossRealmPKMatchPlayer player)
{
var teamModel = ModelCenter.Instance.GetModel<TeamModel>();
if (teamModel.isMatching)
{
teamModel.RequestCancelAutoMatchTeam();
}
-
- var package = new HC001_tagGCCrossRealmPKMatchOK();
- //package.RoomID = 1000;
- var serverName = ServerListCenter.Instance.currentServer.name;
- var playerName = PlayerDatas.Instance.baseData.PlayerName;
- //package.PlayerName = StringUtility.Contact("[", serverName.Replace("@gm", ""), "]", playerName);
- //package.Number = (byte)UnityEngine.Random.Range(1, 3);
-
- var opponent = new HC001_tagGCCrossRealmPKMatchOK.tagGCCrossRealmPKMatchPlayer();
- opponent.Job = (byte)UnityEngine.Random.Range(1, 3);
- opponent.PlayerName = GetRandomOpponentName(opponent.Job);
- opponent.PlayerID = OPPONENT_PLAYERID;
-
- var exceptedLevel = PlayerDatas.Instance.baseData.LV - UnityEngine.Random.Range(1, 5);
- opponent.LV = (ushort)(Mathf.Clamp(exceptedLevel, FuncOpenLVConfig.Get(157).LimitLV, 999));
- //opponent.MaxProDef = 100;
- //var maxHP = (ulong)(PlayerDatas.Instance.extersion.MaxHP * UnityEngine.Random.Range(0.7f, 0.95f));
- //opponent.MaxHP = (uint)(maxHP % Constants.ExpPointValue);
- //opponent.MaxHPEx = (uint)(maxHP / Constants.ExpPointValue);
- package.MatchPlayer = new HC001_tagGCCrossRealmPKMatchOK.tagGCCrossRealmPKMatchPlayer[] { opponent };
-
- //myPlace = package.Number;
- opponentName = opponent.PlayerName;
+
+ myPlace = 1;
+ opponentName = player.PlayerName;
+ OPPONENT_PLAYERID = player.PlayerID;
StartClientCrossServerOneVsOne();
}
@@ -293,6 +233,7 @@
ClientCrossServerOneVsOne.resultSupplement = resultSupplement;
var sendInfo = new CC108_tagCMCrossRealmPKRobotOver();
sendInfo.IsWin = (byte)(resultSupplement.winPlayerId == PlayerDatas.Instance.baseData.PlayerID ? 1 : 0);
+ sendInfo.TagPlayerID = OPPONENT_PLAYERID;
GameNetSystem.Instance.SendInfo(sendInfo);
}
--
Gitblit v1.8.0