From 022ad06b6a0100c540032ee3daa9de06fa0b2891 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 28 十一月 2025 15:14:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/ItemTip/ItemTipWayWin.cs | 14 +++++++
Main/System/PhantasmPavilion/PhantasmPavilionTilteWin.cs | 16 ++++----
Main/Utility/TimeUtility.cs | 8 ++--
Main/Core/NetworkPackage/GameNetSystem.cs | 17 ++++----
Main/System/Battle/BaseBattleWin.cs | 9 ++--
Main/System/Settlement/BattleSettlementManager.cs | 5 ++
Main/System/Main/HomeWin.cs | 13 +++++-
Main/System/InternalAffairs/GoldRushManager.cs | 4 +-
Main/System/NewBieGuidance/NewBieCenter.cs | 13 ++++++
Main/System/PhantasmPavilion/PhantasmPavilionManager.Attr.cs | 2
Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs | 4 +-
Main/System/Guild/GuildBaseWin.cs | 4 +-
Main/System/NewBieGuidance/NewBieWin.cs | 4 +-
13 files changed, 77 insertions(+), 36 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 08d7a75..f58a53f 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
@@ -8,10 +8,10 @@
//绫诲瀷
static Dictionary<int, ulong> lastPackUIDDict = new Dictionary<int, ulong>()
{
-#if UNITY_EDITOR
+// #if UNITY_EDITOR
{(int)PlayerDataType.ExAttr1, 0},
{(int)PlayerDataType.ExAttr2, 0},
-#endif
+// #endif
{(int)PlayerDataType.default26, 0},
};
public override void Done(GameNetPackBasic vNetPack)
diff --git a/Main/Core/NetworkPackage/GameNetSystem.cs b/Main/Core/NetworkPackage/GameNetSystem.cs
index 56744e6..059ca0b 100644
--- a/Main/Core/NetworkPackage/GameNetSystem.cs
+++ b/Main/Core/NetworkPackage/GameNetSystem.cs
@@ -152,14 +152,15 @@
}
}
- if (waitLoginMap)
- {
- if (protocol is not C0123_tagCClientPackVersion && protocol is not C0101_tagCPlayerLogin)
- {
- Debug.LogWarning("绛夊緟0403鍖咃紝涓嶅厑璁稿彂閫佸叾浠栧寘 " + protocol.ToString());
- return;
- }
- }
+ // 0102鏄粠鍦板浘鍙戦�佺殑 璇存槑宸茬櫥褰曪紝闄ら潪鏈嶅姟绔姤閿欏紓甯革紝杩欓噷鍙互涓嶅睆钄�
+ // if (waitLoginMap)
+ // {
+ // if (protocol is not C0123_tagCClientPackVersion && protocol is not C0101_tagCPlayerLogin)
+ // {
+ // Debug.LogError("绛夊緟0403鍖咃紝涓嶅厑璁稿彂閫佸叾浠栧寘 " + protocol.ToString());
+ // return;
+ // }
+ // }
if (mainSocket != null)
{
diff --git a/Main/System/Battle/BaseBattleWin.cs b/Main/System/Battle/BaseBattleWin.cs
index 604ec76..5088f75 100644
--- a/Main/System/Battle/BaseBattleWin.cs
+++ b/Main/System/Battle/BaseBattleWin.cs
@@ -196,7 +196,7 @@
int passRound = BattleManager.Instance.defaultPassRound;
var name = battleField.ToString();
-
+
// 妫�鏌ユ槸鍚︿负姘镐箙鐗规潈鍗＄帺瀹�
bool hasForeverPrivilege = InvestModel.Instance.IsInvested(InvestModel.foreverCardType);
@@ -237,10 +237,11 @@
// 濡傛灉鎴樺満绫诲瀷涓嶅湪 FieldNameToIndex 涓紝浣跨敤榛樿閰嶇疆
}
- int nowRound = battleField.round;
- if (nowRound < passRound)
+ int nowRound = battleField.round;
+ int realPassRound = passRound + 1; // 閰嶇疆鏄秴杩噚鍥炲悎鍙互璺�,鎰忓懗鐫�x+1鍥炲悎鍙互璺�
+ if (nowRound < realPassRound)
{
- SysNotifyMgr.Instance.ShowTip("BattlePass", passRound - nowRound);
+ SysNotifyMgr.Instance.ShowTip("BattlePass", realPassRound - nowRound);
return;
}
battleField.ForceFinish();
diff --git a/Main/System/Guild/GuildBaseWin.cs b/Main/System/Guild/GuildBaseWin.cs
index ef5e6c9..f75ce64 100644
--- a/Main/System/Guild/GuildBaseWin.cs
+++ b/Main/System/Guild/GuildBaseWin.cs
@@ -78,7 +78,7 @@
void OpenHawker()
{
- if (TimeUtility.GetToTenClockSeconds() > 0)
+ if (TimeUtility.GetToTheHourSeconds() > 0)
{
SysNotifyMgr.Instance.ShowTip("GuildSys17");
return;
@@ -88,7 +88,7 @@
void ShowHawkerTime()
{
- var toTenSeconds = TimeUtility.GetToTenClockSeconds();
+ var toTenSeconds = TimeUtility.GetToTheHourSeconds();
if (toTenSeconds > 0)
{
guildHawkerTimeText.text = TimeUtility.SecondsToHMS(toTenSeconds);
diff --git a/Main/System/InternalAffairs/GoldRushManager.cs b/Main/System/InternalAffairs/GoldRushManager.cs
index 856d68b..b147075 100644
--- a/Main/System/InternalAffairs/GoldRushManager.cs
+++ b/Main/System/InternalAffairs/GoldRushManager.cs
@@ -65,12 +65,12 @@
get
{
//绗崄涓暟鐢ㄤ簬瀛樺偍鏄惁寮�鍚嚜鍔ㄥ埛鏂帮紝鍏朵粬鏁扮敤浜庡瓨鍌ㄧ墿鍝佺瓑绾�
- var value = QuickSetting.Instance.GetQuickSettingValue<int>(QuickSettingType.AutoGoldRush, 10);
+ var value = QuickSetting.Instance.GetQuickSettingValue<int>(QuickSettingType.AutoGoldRush, 9);
return value == 0;
}
set
{
- QuickSetting.Instance.SetQuickSetting<int>(QuickSettingType.AutoGoldRush, Convert.ToInt32(!value), 10);
+ QuickSetting.Instance.SetQuickSetting<int>(QuickSettingType.AutoGoldRush, Convert.ToInt32(!value), 9);
QuickSetting.Instance.SendPackage();
}
diff --git a/Main/System/ItemTip/ItemTipWayWin.cs b/Main/System/ItemTip/ItemTipWayWin.cs
index 746b092..a6b66cb 100644
--- a/Main/System/ItemTip/ItemTipWayWin.cs
+++ b/Main/System/ItemTip/ItemTipWayWin.cs
@@ -105,6 +105,20 @@
UIManager.Instance.OpenWindow<BuyItemWin>();
}
break;
+ case 2:
+ int index = int.Parse(way.CustomValue);
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Recharge, true))
+ return;
+ RechargeManager.Instance.selectTabIndex = index;
+ if (UIManager.Instance.IsOpened<StoreBaseWin>())
+ {
+ UIManager.Instance.GetUI<StoreBaseWin>().ClickFuncBtn(1);
+ }
+ else
+ {
+ UIManager.Instance.OpenWindow<StoreBaseWin>(1);
+ }
+ break;
case 0:
default:
if (WindowSearchConfig.HasKey(way.WinJumpID))
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index 1e90cf2..d486a3e 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
using DG.Tweening;
using UnityEngine;
using UnityEngine.UI;
@@ -172,8 +173,7 @@
// var battleWin = UIManager.Instance.OpenWindow<BattleWin>();
// battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
- if (!SoundPlayer.Instance.IsPlayBackGroundMuisic())
- SoundPlayer.Instance.PlayBackGroundMusic(38);
+ DelayPlayMusic().Forget();
}
@@ -204,6 +204,15 @@
officialTip.SetActive(OfficialRankManager.Instance.CanOfficialLVUP());
}
+ async UniTask DelayPlayMusic()
+ {
+ await UniTask.Delay(2000);
+ if (!SoundPlayer.Instance.IsPlayBackGroundMuisic())
+ SoundPlayer.Instance.PlayBackGroundMusic(38);
+ }
+
+
+
private void OnClickEnterBoss()
{
// BattleField battleField = BattleManager.Instance.GetBattleFieldByMapID(2); //BOSS鎴樻枟
diff --git a/Main/System/NewBieGuidance/NewBieCenter.cs b/Main/System/NewBieGuidance/NewBieCenter.cs
index 5df85e1..a862717 100644
--- a/Main/System/NewBieGuidance/NewBieCenter.cs
+++ b/Main/System/NewBieGuidance/NewBieCenter.cs
@@ -50,6 +50,7 @@
UIManager.Instance.OnOpenWindow += OnOpenWindow;
UIManager.Instance.OnCloseWindow += OnCloseWindow;
OfficialRankManager.Instance.OnOfficialCanLVUpEvent += OnOfficialCanLVUpEvent;
+ PackManager.Instance.DeleteItemEvent += DeleteDropItem;
}
public override void Release()
@@ -61,6 +62,7 @@
UIManager.Instance.OnOpenWindow -= OnOpenWindow;
UIManager.Instance.OnCloseWindow -= OnCloseWindow;
OfficialRankManager.Instance.OnOfficialCanLVUpEvent -= OnOfficialCanLVUpEvent;
+ PackManager.Instance.DeleteItemEvent -= DeleteDropItem;
}
void OnOfficialCanLVUpEvent()
@@ -100,6 +102,17 @@
}
}
+ void DeleteDropItem(PackType packType, string guid, int itemID, int index, int clearType)
+ {
+ if (packType != PackType.DropItem)
+ return;
+
+ if (TryStartNewBieGuides(waitGuideIDs))
+ {
+ Debug.Log("鎵ц绛夊緟涓殑寮曞" + JsonMapper.ToJson(waitGuideIDs));
+ }
+ }
+
void OnTaskUpdateEvent()
{
var guides = GuideConfig.GetGuideListByType((int)GuideTriggerType.MainLineQuestCanDo);
diff --git a/Main/System/NewBieGuidance/NewBieWin.cs b/Main/System/NewBieGuidance/NewBieWin.cs
index 9f5ff0d..a630c6e 100644
--- a/Main/System/NewBieGuidance/NewBieWin.cs
+++ b/Main/System/NewBieGuidance/NewBieWin.cs
@@ -198,8 +198,8 @@
m_GuideTalkRect.SetActive(false);
DisplayGuide();
}
- //PlayNewBieAudio 涓嶄細琚玼i闊虫晥鎵撴柇
- SoundPlayer.Instance.PlayUIAudio(stepConfig.voice);
+ //PlayNewBieAudio 涓嶄細琚玼i闊虫晥鎵撴柇 PlayUIAudio
+ SoundPlayer.Instance.PlayNewBieAudio(stepConfig.voice);
}
int tryGuideCount = 0;
diff --git a/Main/System/PhantasmPavilion/PhantasmPavilionManager.Attr.cs b/Main/System/PhantasmPavilion/PhantasmPavilionManager.Attr.cs
index 30e7d8b..00ecd7e 100644
--- a/Main/System/PhantasmPavilion/PhantasmPavilionManager.Attr.cs
+++ b/Main/System/PhantasmPavilion/PhantasmPavilionManager.Attr.cs
@@ -45,7 +45,7 @@
bool hasInitAttr = HasInitAttr(type, id);
bool hasStarAddAttr = HasStarAddAttr(type, id);
// 鏈夊垵濮嬪睘鎬�
- if (hasInitAttr && !hasStarAddAttr)
+ if (hasInitAttr)
{
int[] attrIDList = GetAttrIDList(type, id);
// 涓嶆敮鎸佸崌鏄�
diff --git a/Main/System/PhantasmPavilion/PhantasmPavilionTilteWin.cs b/Main/System/PhantasmPavilion/PhantasmPavilionTilteWin.cs
index de4aee5..05ff8f6 100644
--- a/Main/System/PhantasmPavilion/PhantasmPavilionTilteWin.cs
+++ b/Main/System/PhantasmPavilion/PhantasmPavilionTilteWin.cs
@@ -68,6 +68,7 @@
InitRedPoint();
TabSetActive();
SelectTiltleBtn();
+ txtName.SetActive(false); //绉板彿鍚嶇О涓庣編鏈祫婧愪竴浣擄紝涓嶉渶瑕侀澶栧崟鐙樉绀�
}
protected override void OnPreClose()
@@ -145,6 +146,12 @@
private void RefreshAll(PhantasmPavilionType type, int tabType, bool isJump = true)
{
+ // 鍗镐笅绉板彿鍚�,鑷姩閫変腑绗竴涓墿鍝�
+ if (!manager.Has(type, manager.selectId))
+ {
+ manager.SetSelectItemId(type, functionOrder + 1);
+ }
+
scrTitle.m_Scorller.RefreshActiveCellViews();
if (isJump)
{
@@ -212,7 +219,7 @@
btnTakeOff2.SetActive(state == PhantasmPavilionState.Activated && isCanStarAdd && isUsing);
btnTakeOff1.SetActive(state == PhantasmPavilionState.Activated && !isCanStarAdd && isUsing && hasLimitTimeShow);
- btnTakeOff3.SetActive(state == PhantasmPavilionState.Activated && isCanStarAdd && isUsing && !hasLimitTimeShow);
+ btnTakeOff3.SetActive(state == PhantasmPavilionState.Activated && !isCanStarAdd && isUsing && !hasLimitTimeShow);
btnUnlock.Display(id);
btnUnlock1.Display(id);
btnAddStar.Display(id);
@@ -222,13 +229,6 @@
UpdateTimer(type, id);
}
-
- void RefreshScroller(PhantasmPavilionType type)
- {
- scrTitle.m_Scorller.RefreshActiveCellViews();
- CreateInfoScroller();
- }
-
private void CreateInfoScroller()
{
diff --git a/Main/System/Settlement/BattleSettlementManager.cs b/Main/System/Settlement/BattleSettlementManager.cs
index 5c8a741..6f29276 100644
--- a/Main/System/Settlement/BattleSettlementManager.cs
+++ b/Main/System/Settlement/BattleSettlementManager.cs
@@ -91,7 +91,10 @@
break;
}
- SoundPlayer.Instance.PlayUIAudio(57);
+ if (isWin)
+ {
+ SoundPlayer.Instance.PlayUIAudio(57);
+ }
}
//"Msg":{"itemInfo":[{"ItemID":5,"Count":2},{"ItemID":3,"Count":40}],"winFaction":1,"statInfo":{"1":{"1":{"1":{"NPCID":0,"DefHurt":727,"CureHP":0,"AtkHurt":1891,"ObjID":1,"HeroID":530004},"3":{"NPCID":0,"DefHurt":483,"CureHP":1511,"AtkHurt":782,"ObjID":6,"HeroID":520001},"2":{"NPCID":0,"DefHurt":953,"CureHP":0,"AtkHurt":1712,"ObjID":5,"HeroID":510003}}},"2":{"1":{"1":{"NPCID":10101091,"DefHurt":638,"CureHP":0,"AtkHurt":140,"ObjID":2,"HeroID":610001},"3":{"NPCID":10101092,"DefHurt":625,"CureHP":0,"AtkHurt":126,"ObjID":3,"HeroID":610001},"5":{"NPCID":10101093,"DefHurt":3122,"CureHP":0,"AtkHurt":1897,"ObjID":4,"HeroID":510003}}}}}
diff --git a/Main/Utility/TimeUtility.cs b/Main/Utility/TimeUtility.cs
index 6aad2aa..f30b538 100644
--- a/Main/Utility/TimeUtility.cs
+++ b/Main/Utility/TimeUtility.cs
@@ -496,13 +496,13 @@
}
- // 鍒�10鐐硅繕瑕佸灏戠锛屽鏋滃凡缁忚繃浜�10鐐癸紝杩斿洖0
- public static int GetToTenClockSeconds()
+ // 浠婃棩鍒皒鐐硅繕瑕佸灏戠锛屽鏋滃凡缁忚繃浜唜鐐癸紝杩斿洖0
+ public static int GetToTheHourSeconds(int hour=10)
{
var now = ServerNow;
- if (now.Hour < 10)
+ if (now.Hour < hour)
{
- return (int)(ServerNow - new DateTime(now.Year, now.Month, now.Day, 10, 0, 0)).TotalSeconds;
+ return (int)(new DateTime(now.Year, now.Month, now.Day, hour, 0, 0) - ServerNow).TotalSeconds;
}
return 0;
}
--
Gitblit v1.8.0