From 168e039cef99df9f0ee91d8ef975c2e7f2a9fb95 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 05 十一月 2025 17:47:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Battle/BaseBattleWin.cs | 16 +---------------
Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs | 20 +++++++++++++++++---
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
index 9b63f85..ad029fd 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
@@ -1,10 +1,17 @@
using UnityEngine;
using System.Collections;
+using System.Collections.Generic;
//04 18 鍛ㄥ洿瀵硅薄鍒锋柊#tagObjInfoRefresh
public class DTC0418_tagObjInfoRefresh : DtcBasic {
- static ulong lastPackUID = 0;
+ //绫诲瀷
+ static Dictionary<int, ulong> lastPackUIDDict = new Dictionary<int, ulong>()
+ {
+ {(int)PlayerDataType.ExAttr1, 0},
+ {(int)PlayerDataType.ExAttr2, 0},
+ {(int)PlayerDataType.default26, 0},
+ };
public override void Done(GameNetPackBasic vNetPack)
{
base.Done(vNetPack);
@@ -16,9 +23,16 @@
switch (vNetData.ObjType)
{
case 1:
- if (vNetData.packUID > DTC0102_tagCDBPlayer.loginPackUID && vNetData.packUID > lastPackUID)
+ if (vNetData.packUID > DTC0102_tagCDBPlayer.loginPackUID)
{
- lastPackUID = vNetData.packUID;
+ if (lastPackUIDDict.ContainsKey(vNetData.RefreshType))
+ {
+ if (vNetData.packUID < lastPackUIDDict[vNetData.RefreshType])
+ {
+ return;
+ }
+ lastPackUIDDict[vNetData.RefreshType] = vNetData.packUID;
+ }
//闃茶寖鏂嚎閲嶈繛鏃讹紝鎴樻枟涓殑鏃у寘褰卞搷鏁版嵁
Update0418(vNetData);
}
diff --git a/Main/System/Battle/BaseBattleWin.cs b/Main/System/Battle/BaseBattleWin.cs
index 3d127bb..1a2b085 100644
--- a/Main/System/Battle/BaseBattleWin.cs
+++ b/Main/System/Battle/BaseBattleWin.cs
@@ -14,7 +14,6 @@
[SerializeField] protected Button btnSpeed; // 閫熷害鎺у埗
[SerializeField] protected Text textSpeed; // 閫熷害鏄剧ず
[SerializeField] protected Button btnPass; // 璺宠繃鎴樻枟
- [SerializeField] protected Button btnPause; // 鏆傚仠鎸夐挳 (BattleWin涓殑btnStop鍙搴旀鎸夐挳)
[Header("鎴樻枟UI缁勪欢")]
[SerializeField] protected TotalDamageDisplayer totalDamageDisplayer; // 浼ゅ缁熻
@@ -33,9 +32,6 @@
if (btnPass != null)
btnPass.AddListener(OnClickPass);
-
- if (btnPause != null)
- btnPause.AddListener(OnClickPause);
}
protected override void OnPreOpen()
@@ -179,16 +175,6 @@
/// <summary>
- /// 鏆傚仠/缁х画
- /// </summary>
- protected virtual void OnClickPause()
- {
- if (null == battleField)
- return;
- battleField.IsPause = !battleField.IsPause;
- }
-
- /// <summary>
/// 璺宠繃鎴樻枟
/// </summary>
protected virtual void OnClickPass()
@@ -285,7 +271,7 @@
{
if (txtBattleRound != null)
{
- txtBattleRound.text = string.Format("{0}/{1}", round, maxRound);
+ txtBattleRound.text = Language.Get("RoundText", round, maxRound);
}
}
--
Gitblit v1.8.0