From 9c7efb57bf1b21954c7d81b705c8a8a34e7fb364 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 01 七月 2025 17:39:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Boss/MainBossEnterWin.cs | 44 ++
Main/System/Login/ServerData.cs | 2
Main/Component/UI/Common/TimerBehaviour.cs | 2
Main/Component/UI/Decorate/Move/UISmoothMove.cs | 2
Main/Component/UI/Common/ItemBehaviour.cs | 12
Main/System/AssetVersion/DownLoadWin.cs | 2
Main/System/Login/ServerBehaviourGroup.cs | 2
Main/System/ClientVersion/VersionUtility.cs | 2
Main/Config/Configs/FrameAnimationConfig.cs.meta | 0
Main/System/Equip/EquipSet.cs | 9
Main/System/Boss/MainBossRankWin.cs.meta | 11
Main/Component/UI/Decorate/Graph/PolylineImage.cs | 2
Main/System/Redpoint/MainRedDot.cs | 2
Main/Component/UI/Common/UIFuncOpen.cs | 2
Main/Component/UI/Common/PopupMessage.cs | 2
Main/System/KnapSack/New/CommonItemBaisc.cs | 662 ++++++++++++++++----------------
Main/Component/UI/Common/FunctionButtonGroup.cs | 2
Main/System/KnapSack/New/ItemCell.cs | 49 --
Main/Component/UI/Common/AutoSelectCyclicScroll.cs | 2
Main/Component/UI/Common/GestureCatcher.cs | 2
Main/Component/UI/Decorate/Graph/Hexagon.cs | 2
Main/System/Chat/ChatFriend.cs | 2
Main/System/Login/ServerBehaviour.cs | 2
Main/Component/UI/Common/DragContainer.cs | 2
Main/System/Boss/MainBossEnterWin.cs.meta | 11
Main/Component/UI/Common/ScreenMoveTo.cs | 2
Main/Component/UI/Common/BoundedDrag.cs | 2
Main/Component/UI/Decorate/Graph/OffsetImage.cs | 2
Main/Component/UI/Common/FakeButton.cs | 2
Main/System/KnapSack/BackpackData.cs | 2
Main/Component/UI/Common/DynamicCyclicScroll.cs | 2
Main/System/Tip/PopConfirmWin.cs | 2
Main/Component/UI/Decorate/Tweens/UIAlphaTween.cs | 2
Main/System/Equip/EquipSuitEffect.cs | 2
Main/System/UIBase/UIBase.cs | 6
Main/Component/UI/Decorate/Graph/CustomImage.cs | 2
Main/Component/UI/Core/ToggleButtonGroup.cs | 2
Main/System/Equip/EquipModel.cs | 13
Main/System/Skill/FlipScroll.cs | 2
Main/Config/ConfigManager.cs | 6
Main/Component/UI/Core/DelayButton.cs | 2
Main/System/Boss.meta | 8
Main/Component/UI/Common/CanvasRaycastFilter.cs | 2
Main/System/Sound/SoundUtility.cs | 2
Main/System/Chat/ChatWin.cs | 2
Main/Core/Frame/UIFrame.cs | 2
Main/Component/UI/Common/FunctionButton.cs | 2
Main/Component/UI/Common/ItemBaseEffect.cs | 2
Main/Component/UI/Decorate/Graph/OffsetImage2.cs | 2
Main/Component/UI/Decorate/Move/UILinerMove.cs | 2
Main/System/OfficialRank/OfficialTitleCell.cs.meta | 11
Main/System/CustomizedGift/CustomizedGiftCell.cs | 2
Main/Component/UI/Core/PointerDownUp.cs | 2
Main/System/Main/HomeWin.cs | 8
Main/Config/Configs/FrameAnimationConfig.cs | 4
Main/Component/UI/Common/ScreenDiffuseMove.cs | 2
Main/System/CustomizedGift/CustomizedGiftWin.cs | 2
Main/Component/UI/Common/OnOffToggle.cs | 2
Main/Core/Frame/UIFrameMgr.cs | 8
Main/System/PhantasmPavilion/AvatarCell.cs | 16
Main/System/Chat/ChatFloatWin.cs | 2
Main/Component/UI/Common/CoolDownBehaviour.cs | 2
Main/Component/UI/Common/DragItem.cs | 2
Main/System/Redpoint/RedpointBehaviour.cs | 2
Main/System/AssetVersion/InGameDownLoadWin.cs | 2
Main/System/Tip/ToggleConfirmWin.cs | 2
Main/Component/UI/Common/UIPlaySound.cs | 2
Main/System/Debug/DebugController.cs | 6
Main/Component/UI/Common/FrameEffect.cs | 2
Main/System/CustomizedGift/CustomizedGiftChooseCell.cs | 2
Main/Component/UI/Decorate/Effect/SpriteEffect.cs | 2
Main/Component/UI/Common/FakeButton2.cs | 2
Main/Config/PartialConfigs/FrameAnimationConfig.cs | 2
Main/System/OfficialRank/OfficialTitleCell.cs | 131 ++++++
Main/System/PhantasmPavilion/PhantasmPavilionModel.cs | 2
Main/Component/UI/Common/RandomTip.cs | 2
Main/System/Boss/MainBossRankWin.cs | 42 ++
Main/System/ItemTip/ItemTipUtility.cs | 2
Main/Component/UI/Decorate/Graph/Rhombus.cs | 2
Main/Component/UI/Common/GameObjectDefaultActive.cs | 2
Main/Component/UI/Common/PopupMessageContainer.cs | 2
Main/Component/UI/Common/UIPrefabLoader.cs | 2
Main/System/Launch/LaunchWin.cs | 2
Main/Config/PartialConfigs/FrameAnimationConfig.cs.meta | 0
Main/System/Tip/ScrollTipWin.cs | 2
Main/System/Login/ServerGroupToggle.cs | 2
86 files changed, 703 insertions(+), 484 deletions(-)
diff --git a/Main/Component/UI/Common/AutoSelectCyclicScroll.cs b/Main/Component/UI/Common/AutoSelectCyclicScroll.cs
index a81bdc6..873e34f 100644
--- a/Main/Component/UI/Common/AutoSelectCyclicScroll.cs
+++ b/Main/Component/UI/Common/AutoSelectCyclicScroll.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, November 01, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/BoundedDrag.cs b/Main/Component/UI/Common/BoundedDrag.cs
index b524442..b926f29 100644
--- a/Main/Component/UI/Common/BoundedDrag.cs
+++ b/Main/Component/UI/Common/BoundedDrag.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, September 06, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/CanvasRaycastFilter.cs b/Main/Component/UI/Common/CanvasRaycastFilter.cs
index ba8f254..3a58b7d 100644
--- a/Main/Component/UI/Common/CanvasRaycastFilter.cs
+++ b/Main/Component/UI/Common/CanvasRaycastFilter.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, July 02, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/CoolDownBehaviour.cs b/Main/Component/UI/Common/CoolDownBehaviour.cs
index c3d1a44..e1a14e4 100644
--- a/Main/Component/UI/Common/CoolDownBehaviour.cs
+++ b/Main/Component/UI/Common/CoolDownBehaviour.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, October 24, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/DragContainer.cs b/Main/Component/UI/Common/DragContainer.cs
index a75be3c..175d1fa 100644
--- a/Main/Component/UI/Common/DragContainer.cs
+++ b/Main/Component/UI/Common/DragContainer.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, July 31, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/DragItem.cs b/Main/Component/UI/Common/DragItem.cs
index 1746546..22b102b 100644
--- a/Main/Component/UI/Common/DragItem.cs
+++ b/Main/Component/UI/Common/DragItem.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, July 31, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/DynamicCyclicScroll.cs b/Main/Component/UI/Common/DynamicCyclicScroll.cs
index 83681db..37c4288 100644
--- a/Main/Component/UI/Common/DynamicCyclicScroll.cs
+++ b/Main/Component/UI/Common/DynamicCyclicScroll.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, August 14, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/FakeButton.cs b/Main/Component/UI/Common/FakeButton.cs
index 894054f..e53a43c 100644
--- a/Main/Component/UI/Common/FakeButton.cs
+++ b/Main/Component/UI/Common/FakeButton.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Saturday, November 25, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/FakeButton2.cs b/Main/Component/UI/Common/FakeButton2.cs
index 68767a8..9765204 100644
--- a/Main/Component/UI/Common/FakeButton2.cs
+++ b/Main/Component/UI/Common/FakeButton2.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Saturday, November 25, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/FrameEffect.cs b/Main/Component/UI/Common/FrameEffect.cs
index 8572c88..c062673 100644
--- a/Main/Component/UI/Common/FrameEffect.cs
+++ b/Main/Component/UI/Common/FrameEffect.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Sunday, December 10, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/FunctionButton.cs b/Main/Component/UI/Common/FunctionButton.cs
index b348232..b4718f1 100644
--- a/Main/Component/UI/Common/FunctionButton.cs
+++ b/Main/Component/UI/Common/FunctionButton.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, October 31, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/FunctionButtonGroup.cs b/Main/Component/UI/Common/FunctionButtonGroup.cs
index daede41..66b475f 100644
--- a/Main/Component/UI/Common/FunctionButtonGroup.cs
+++ b/Main/Component/UI/Common/FunctionButtonGroup.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, October 31, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/GameObjectDefaultActive.cs b/Main/Component/UI/Common/GameObjectDefaultActive.cs
index 46aa723..baf7ea9 100644
--- a/Main/Component/UI/Common/GameObjectDefaultActive.cs
+++ b/Main/Component/UI/Common/GameObjectDefaultActive.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, July 31, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/GestureCatcher.cs b/Main/Component/UI/Common/GestureCatcher.cs
index 35ce333..e1ecabd 100644
--- a/Main/Component/UI/Common/GestureCatcher.cs
+++ b/Main/Component/UI/Common/GestureCatcher.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Saturday, March 16, 2019
//--------------------------------------------------------
using System;
diff --git a/Main/Component/UI/Common/ItemBaseEffect.cs b/Main/Component/UI/Common/ItemBaseEffect.cs
index 442d2c4..cf33cb8 100644
--- a/Main/Component/UI/Common/ItemBaseEffect.cs
+++ b/Main/Component/UI/Common/ItemBaseEffect.cs
@@ -140,6 +140,8 @@
{
switch (format)
{
+ case ItemCellformat.Format_100x100:
+ return 1.1f;
case ItemCellformat.Format_80x80:
return 0.95f;
case ItemCellformat.Format_70x70:
diff --git a/Main/Component/UI/Common/ItemBehaviour.cs b/Main/Component/UI/Common/ItemBehaviour.cs
index a7731a2..e3de873 100644
--- a/Main/Component/UI/Common/ItemBehaviour.cs
+++ b/Main/Component/UI/Common/ItemBehaviour.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, July 31, 2017
//--------------------------------------------------------
using UnityEngine;
@@ -192,8 +192,8 @@
Rewards,
Use,
}
-}
-
-
-
-
+}
+
+
+
+
diff --git a/Main/Component/UI/Common/OnOffToggle.cs b/Main/Component/UI/Common/OnOffToggle.cs
index 2835b04..d4ba25a 100644
--- a/Main/Component/UI/Common/OnOffToggle.cs
+++ b/Main/Component/UI/Common/OnOffToggle.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, August 23, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/PopupMessage.cs b/Main/Component/UI/Common/PopupMessage.cs
index 170592b..977fbb3 100644
--- a/Main/Component/UI/Common/PopupMessage.cs
+++ b/Main/Component/UI/Common/PopupMessage.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, August 14, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/PopupMessageContainer.cs b/Main/Component/UI/Common/PopupMessageContainer.cs
index d2bb252..029a678 100644
--- a/Main/Component/UI/Common/PopupMessageContainer.cs
+++ b/Main/Component/UI/Common/PopupMessageContainer.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, August 14, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/RandomTip.cs b/Main/Component/UI/Common/RandomTip.cs
index 6c8a668..47d7848 100644
--- a/Main/Component/UI/Common/RandomTip.cs
+++ b/Main/Component/UI/Common/RandomTip.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, November 09, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/ScreenDiffuseMove.cs b/Main/Component/UI/Common/ScreenDiffuseMove.cs
index f412ec1..bebeb2e 100644
--- a/Main/Component/UI/Common/ScreenDiffuseMove.cs
+++ b/Main/Component/UI/Common/ScreenDiffuseMove.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, September 07, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/ScreenMoveTo.cs b/Main/Component/UI/Common/ScreenMoveTo.cs
index 5b1d630..b5bb44e 100644
--- a/Main/Component/UI/Common/ScreenMoveTo.cs
+++ b/Main/Component/UI/Common/ScreenMoveTo.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, September 07, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/TimerBehaviour.cs b/Main/Component/UI/Common/TimerBehaviour.cs
index a80956d..f5b5e52 100644
--- a/Main/Component/UI/Common/TimerBehaviour.cs
+++ b/Main/Component/UI/Common/TimerBehaviour.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Saturday, November 11, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/UIFuncOpen.cs b/Main/Component/UI/Common/UIFuncOpen.cs
index 69277f5..c4c0ce6 100644
--- a/Main/Component/UI/Common/UIFuncOpen.cs
+++ b/Main/Component/UI/Common/UIFuncOpen.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Friday, September 29, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/UIPlaySound.cs b/Main/Component/UI/Common/UIPlaySound.cs
index c3a5885..078c787 100644
--- a/Main/Component/UI/Common/UIPlaySound.cs
+++ b/Main/Component/UI/Common/UIPlaySound.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, December 07, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Common/UIPrefabLoader.cs b/Main/Component/UI/Common/UIPrefabLoader.cs
index d3f290d..a4b351e 100644
--- a/Main/Component/UI/Common/UIPrefabLoader.cs
+++ b/Main/Component/UI/Common/UIPrefabLoader.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, March 19, 2019
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Core/DelayButton.cs b/Main/Component/UI/Core/DelayButton.cs
index db9f9b7..748b752 100644
--- a/Main/Component/UI/Core/DelayButton.cs
+++ b/Main/Component/UI/Core/DelayButton.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, July 31, 2017
//--------------------------------------------------------
diff --git a/Main/Component/UI/Core/PointerDownUp.cs b/Main/Component/UI/Core/PointerDownUp.cs
index 31e46f1..ec9f990 100644
--- a/Main/Component/UI/Core/PointerDownUp.cs
+++ b/Main/Component/UI/Core/PointerDownUp.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, July 31, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Core/ToggleButtonGroup.cs b/Main/Component/UI/Core/ToggleButtonGroup.cs
index a79df36..68e49dd 100644
--- a/Main/Component/UI/Core/ToggleButtonGroup.cs
+++ b/Main/Component/UI/Core/ToggleButtonGroup.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, October 10, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Decorate/Effect/SpriteEffect.cs b/Main/Component/UI/Decorate/Effect/SpriteEffect.cs
index 5f8c525..77ba33e 100644
--- a/Main/Component/UI/Decorate/Effect/SpriteEffect.cs
+++ b/Main/Component/UI/Decorate/Effect/SpriteEffect.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, August 22, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Decorate/Graph/CustomImage.cs b/Main/Component/UI/Decorate/Graph/CustomImage.cs
index 16dfc8d..4c45040 100644
--- a/Main/Component/UI/Decorate/Graph/CustomImage.cs
+++ b/Main/Component/UI/Decorate/Graph/CustomImage.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, August 10, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Decorate/Graph/Hexagon.cs b/Main/Component/UI/Decorate/Graph/Hexagon.cs
index fef0cfe..0fd2a6d 100644
--- a/Main/Component/UI/Decorate/Graph/Hexagon.cs
+++ b/Main/Component/UI/Decorate/Graph/Hexagon.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, August 23, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Decorate/Graph/OffsetImage.cs b/Main/Component/UI/Decorate/Graph/OffsetImage.cs
index a2ef73e..aaa38a6 100644
--- a/Main/Component/UI/Decorate/Graph/OffsetImage.cs
+++ b/Main/Component/UI/Decorate/Graph/OffsetImage.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, August 23, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Decorate/Graph/OffsetImage2.cs b/Main/Component/UI/Decorate/Graph/OffsetImage2.cs
index 1ff47f5..1f3b6fa 100644
--- a/Main/Component/UI/Decorate/Graph/OffsetImage2.cs
+++ b/Main/Component/UI/Decorate/Graph/OffsetImage2.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, August 23, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Decorate/Graph/PolylineImage.cs b/Main/Component/UI/Decorate/Graph/PolylineImage.cs
index 063fcab..e454443 100644
--- a/Main/Component/UI/Decorate/Graph/PolylineImage.cs
+++ b/Main/Component/UI/Decorate/Graph/PolylineImage.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, August 10, 2017
//--------------------------------------------------------
diff --git a/Main/Component/UI/Decorate/Graph/Rhombus.cs b/Main/Component/UI/Decorate/Graph/Rhombus.cs
index 52ad822..3144ac5 100644
--- a/Main/Component/UI/Decorate/Graph/Rhombus.cs
+++ b/Main/Component/UI/Decorate/Graph/Rhombus.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, August 23, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Decorate/Move/UILinerMove.cs b/Main/Component/UI/Decorate/Move/UILinerMove.cs
index 00b30c0..3c2753b 100644
--- a/Main/Component/UI/Decorate/Move/UILinerMove.cs
+++ b/Main/Component/UI/Decorate/Move/UILinerMove.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, April 09, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Decorate/Move/UISmoothMove.cs b/Main/Component/UI/Decorate/Move/UISmoothMove.cs
index b15f3b2..4c8f483 100644
--- a/Main/Component/UI/Decorate/Move/UISmoothMove.cs
+++ b/Main/Component/UI/Decorate/Move/UISmoothMove.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, April 09, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Component/UI/Decorate/Tweens/UIAlphaTween.cs b/Main/Component/UI/Decorate/Tweens/UIAlphaTween.cs
index f272464..52a0236 100644
--- a/Main/Component/UI/Decorate/Tweens/UIAlphaTween.cs
+++ b/Main/Component/UI/Decorate/Tweens/UIAlphaTween.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, September 14, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/Config/ConfigManager.cs b/Main/Config/ConfigManager.cs
index 9574554..baeb932 100644
--- a/Main/Config/ConfigManager.cs
+++ b/Main/Config/ConfigManager.cs
@@ -52,10 +52,10 @@
typeof(EmojiPackConfig),
typeof(EquipGSParamConfig),
typeof(EquipPlaceMapConfig),
- typeof(FaceConfig),
typeof(FamilyConfig),
typeof(FamilyEmblemConfig),
typeof(FirstGoldConfig),
+ typeof(FrameAnimationConfig),
typeof(FuncConfigConfig),
typeof(FuncOpenLVConfig),
typeof(FunctionTeamSetConfig),
@@ -230,14 +230,14 @@
ClearConfigDictionary<EquipGSParamConfig>();
// 娓呯┖ EquipPlaceMapConfig 瀛楀吀
ClearConfigDictionary<EquipPlaceMapConfig>();
- // 娓呯┖ FaceConfig 瀛楀吀
- ClearConfigDictionary<FaceConfig>();
// 娓呯┖ FamilyConfig 瀛楀吀
ClearConfigDictionary<FamilyConfig>();
// 娓呯┖ FamilyEmblemConfig 瀛楀吀
ClearConfigDictionary<FamilyEmblemConfig>();
// 娓呯┖ FirstGoldConfig 瀛楀吀
ClearConfigDictionary<FirstGoldConfig>();
+ // 娓呯┖ FrameAnimationConfig 瀛楀吀
+ ClearConfigDictionary<FrameAnimationConfig>();
// 娓呯┖ FuncConfigConfig 瀛楀吀
ClearConfigDictionary<FuncConfigConfig>();
// 娓呯┖ FuncOpenLVConfig 瀛楀吀
diff --git a/Main/Config/Configs/FaceConfig.cs b/Main/Config/Configs/FrameAnimationConfig.cs
similarity index 88%
rename from Main/Config/Configs/FaceConfig.cs
rename to Main/Config/Configs/FrameAnimationConfig.cs
index bbd01d1..32acc17 100644
--- a/Main/Config/Configs/FaceConfig.cs
+++ b/Main/Config/Configs/FrameAnimationConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: Friday, June 27, 2025
+// [ Date ]: 2025骞�6鏈�30鏃�
//--------------------------------------------------------
using System.Collections.Generic;
@@ -10,7 +10,7 @@
using UnityEngine;
using LitJson;
-public partial class FaceConfig : ConfigBase<string, FaceConfig>
+public partial class FrameAnimationConfig : ConfigBase<string, FrameAnimationConfig>
{
public string name;
diff --git a/Main/Config/Configs/FaceConfig.cs.meta b/Main/Config/Configs/FrameAnimationConfig.cs.meta
similarity index 100%
rename from Main/Config/Configs/FaceConfig.cs.meta
rename to Main/Config/Configs/FrameAnimationConfig.cs.meta
diff --git a/Main/Config/PartialConfigs/FaceConfig.cs b/Main/Config/PartialConfigs/FrameAnimationConfig.cs
similarity index 88%
rename from Main/Config/PartialConfigs/FaceConfig.cs
rename to Main/Config/PartialConfigs/FrameAnimationConfig.cs
index eb839fb..36c252e 100644
--- a/Main/Config/PartialConfigs/FaceConfig.cs
+++ b/Main/Config/PartialConfigs/FrameAnimationConfig.cs
@@ -4,7 +4,7 @@
using UnityEngine;
using System.Threading;
-public partial class FaceConfig : ConfigBase<string, FaceConfig>
+public partial class FrameAnimationConfig : ConfigBase<string, FrameAnimationConfig>
{
//<琛ㄦ儏鍖匢D,List<Name>>
private static Dictionary<int, List<string>> resultDict = new Dictionary<int, List<string>>();
diff --git a/Main/Config/PartialConfigs/FaceConfig.cs.meta b/Main/Config/PartialConfigs/FrameAnimationConfig.cs.meta
similarity index 100%
rename from Main/Config/PartialConfigs/FaceConfig.cs.meta
rename to Main/Config/PartialConfigs/FrameAnimationConfig.cs.meta
diff --git a/Main/Core/Frame/UIFrame.cs b/Main/Core/Frame/UIFrame.cs
index af69a02..ef20034 100644
--- a/Main/Core/Frame/UIFrame.cs
+++ b/Main/Core/Frame/UIFrame.cs
@@ -60,7 +60,7 @@
index = 1;
- FaceConfig cfg = FaceConfig.Get(frameKey);
+ FrameAnimationConfig cfg = FrameAnimationConfig.Get(frameKey);
if (cfg != null&& cfg.speed > 0) {
m_Interval = 1.0f / cfg.speed;
}
diff --git a/Main/Core/Frame/UIFrameMgr.cs b/Main/Core/Frame/UIFrameMgr.cs
index 87d6ad3..7a193e3 100644
--- a/Main/Core/Frame/UIFrameMgr.cs
+++ b/Main/Core/Frame/UIFrameMgr.cs
@@ -47,7 +47,7 @@
/// <summary>
/// 鍔犺浇鎸囧畾甯у姩鐢昏祫婧�
/// </summary>
- private void LoadFrameSprites(FaceConfig cfg)
+ private void LoadFrameSprites(FrameAnimationConfig cfg)
{
if (allFrameDic.ContainsKey(cfg.name))
return;
@@ -80,7 +80,7 @@
// 鎸夐渶鍔犺浇璧勬簮
if (!allFrameDic.ContainsKey(key))
{
- LoadFrameSprites(FaceConfig.Get(key));
+ LoadFrameSprites(FrameAnimationConfig.Get(key));
}
if (allFrameDic.TryGetValue(key, out var list))
@@ -95,7 +95,7 @@
/// </summary>
public bool ContainsDynamicImage(string key)
{
- return FaceConfig.HasKey(key);
+ return FrameAnimationConfig.HasKey(key);
}
@@ -106,7 +106,7 @@
{
if (!allFrameDic.ContainsKey(key))
{
- LoadFrameSprites(FaceConfig.Get(key));
+ LoadFrameSprites(FrameAnimationConfig.Get(key));
}
}
}
\ No newline at end of file
diff --git a/Main/System/AssetVersion/DownLoadWin.cs b/Main/System/AssetVersion/DownLoadWin.cs
index 10765ba..7582b43 100644
--- a/Main/System/AssetVersion/DownLoadWin.cs
+++ b/Main/System/AssetVersion/DownLoadWin.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, January 09, 2018
//--------------------------------------------------------
diff --git a/Main/System/AssetVersion/InGameDownLoadWin.cs b/Main/System/AssetVersion/InGameDownLoadWin.cs
index 051fc1b..19f5179 100644
--- a/Main/System/AssetVersion/InGameDownLoadWin.cs
+++ b/Main/System/AssetVersion/InGameDownLoadWin.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, May 23, 2018
//--------------------------------------------------------
diff --git a/Main/System/Boss.meta b/Main/System/Boss.meta
new file mode 100644
index 0000000..fdf93e3
--- /dev/null
+++ b/Main/System/Boss.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c969d67096e20dc419cc22ed78640290
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/Boss/MainBossEnterWin.cs b/Main/System/Boss/MainBossEnterWin.cs
new file mode 100644
index 0000000..096abaf
--- /dev/null
+++ b/Main/System/Boss/MainBossEnterWin.cs
@@ -0,0 +1,44 @@
+锘�//--------------------------------------------------------
+// [Author]: 鐜╀釜娓告垙
+// [ Date ]: Tuesday, July 24, 2018
+//--------------------------------------------------------
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+
+public class MainBossEnterWin : UIBase
+{
+ [SerializeField] Text fbNameText;
+ [SerializeField] Button CloseBtn;
+
+
+ protected override void OnPreOpen()
+ {
+
+ }
+
+ protected override void OnOpen()
+ {
+ }
+
+ protected override void OnPreClose()
+ {
+
+ }
+
+ protected override void OnClose()
+ {
+ base.OnClose();
+ }
+
+
+
+}
+
+
+
+
diff --git a/Main/System/Boss/MainBossEnterWin.cs.meta b/Main/System/Boss/MainBossEnterWin.cs.meta
new file mode 100644
index 0000000..24a2cf7
--- /dev/null
+++ b/Main/System/Boss/MainBossEnterWin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cd083f198a8a73644abc5362a8f63b0c
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/Boss/MainBossRankWin.cs b/Main/System/Boss/MainBossRankWin.cs
new file mode 100644
index 0000000..48679f6
--- /dev/null
+++ b/Main/System/Boss/MainBossRankWin.cs
@@ -0,0 +1,42 @@
+锘�//--------------------------------------------------------
+// [Author]: 鐜╀釜娓告垙
+// [ Date ]: Tuesday, July 24, 2018
+//--------------------------------------------------------
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+
+public class MainBossRankWin : UIBase
+{
+
+
+ protected override void OnPreOpen()
+ {
+
+ }
+
+ protected override void OnOpen()
+ {
+ }
+
+ protected override void OnPreClose()
+ {
+
+ }
+
+ protected override void OnClose()
+ {
+ base.OnClose();
+ }
+
+
+
+}
+
+
+
+
diff --git a/Main/System/Boss/MainBossRankWin.cs.meta b/Main/System/Boss/MainBossRankWin.cs.meta
new file mode 100644
index 0000000..d1d978f
--- /dev/null
+++ b/Main/System/Boss/MainBossRankWin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7e7e900f52142524a9ffc5db6c48c478
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/Chat/ChatFloatWin.cs b/Main/System/Chat/ChatFloatWin.cs
index e54b9f4..42d31f7 100644
--- a/Main/System/Chat/ChatFloatWin.cs
+++ b/Main/System/Chat/ChatFloatWin.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, July 24, 2018
//--------------------------------------------------------
diff --git a/Main/System/Chat/ChatFriend.cs b/Main/System/Chat/ChatFriend.cs
index d54afec..6d11cd5 100644
--- a/Main/System/Chat/ChatFriend.cs
+++ b/Main/System/Chat/ChatFriend.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, September 13, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/Chat/ChatWin.cs b/Main/System/Chat/ChatWin.cs
index 4a23d7e..2b61d04 100644
--- a/Main/System/Chat/ChatWin.cs
+++ b/Main/System/Chat/ChatWin.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, April 09, 2018
//--------------------------------------------------------
diff --git a/Main/System/ClientVersion/VersionUtility.cs b/Main/System/ClientVersion/VersionUtility.cs
index a90d951..42ad9f4 100644
--- a/Main/System/ClientVersion/VersionUtility.cs
+++ b/Main/System/ClientVersion/VersionUtility.cs
@@ -1,5 +1,5 @@
//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, March 15, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/CustomizedGift/CustomizedGiftCell.cs b/Main/System/CustomizedGift/CustomizedGiftCell.cs
index 247a394..a1eedb4 100644
--- a/Main/System/CustomizedGift/CustomizedGiftCell.cs
+++ b/Main/System/CustomizedGift/CustomizedGiftCell.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, September 26, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/CustomizedGift/CustomizedGiftChooseCell.cs b/Main/System/CustomizedGift/CustomizedGiftChooseCell.cs
index 1b5a8d1..e0b5420 100644
--- a/Main/System/CustomizedGift/CustomizedGiftChooseCell.cs
+++ b/Main/System/CustomizedGift/CustomizedGiftChooseCell.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, September 26, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/CustomizedGift/CustomizedGiftWin.cs b/Main/System/CustomizedGift/CustomizedGiftWin.cs
index 8c039da..2b63e1d 100644
--- a/Main/System/CustomizedGift/CustomizedGiftWin.cs
+++ b/Main/System/CustomizedGift/CustomizedGiftWin.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, April 18, 2019
//--------------------------------------------------------
diff --git a/Main/System/Debug/DebugController.cs b/Main/System/Debug/DebugController.cs
index 826e178..78c0fa3 100644
--- a/Main/System/Debug/DebugController.cs
+++ b/Main/System/Debug/DebugController.cs
@@ -16,8 +16,12 @@
private void OnEnable()
{
- m_Version.text = string.Format("{0}_{1} 鍒嗘敮:{2}",
+#if UNITY_EDITOR
+ m_Version.text = string.Empty;
+#else
+ m_Version.text = string.Format("{0}_{1} 鍒嗘敮: {2}",
VersionConfig.Get().version, VersionConfig.Get().buildIndex, VersionConfig.Get().branch);
+#endif
}
diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index bf04d84..62c439e 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -7,7 +7,7 @@
public class EquipModel : GameSystemManager<EquipModel>
{
-
+ EquipSet equipSet = new EquipSet(0);
public void OnPlayerLoginOk()
@@ -70,6 +70,17 @@
return serverEquipPlace;
}
+ public int CompareToCurrent(string equipGuid)
+ {
+ var item = PackManager.Instance.GetItemByGuid(equipGuid);
+ if (item == null)
+ {
+ return 0;
+ }
+
+
+ return equipSet.CompareToCurrent(equipGuid);
+ }
}
diff --git a/Main/System/Equip/EquipSet.cs b/Main/System/Equip/EquipSet.cs
index 2b7a7fe..80ecb71 100644
--- a/Main/System/Equip/EquipSet.cs
+++ b/Main/System/Equip/EquipSet.cs
@@ -6,21 +6,20 @@
public class EquipSet
{
public readonly int maxEquipCnt = 12; //鏈�澶ц澶囨牸瀛愭暟
- public readonly int level; //澶氬鎯呭喌锛屾垨鑰呭娴佹淳瀛樺偍
+ public readonly int mark; //澶氬鎯呭喌锛屾垨鑰呭娴佹淳瀛樺偍
public bool unLocked { get { return true; } } //鍚庣画鏍规嵁鐜╂硶瑙ｉ攣鐨勬儏鍐碉紝濡傝喘涔板瓨鍌ㄦ祦娲句綅
public int fightPower {
get {
- return EquipFightPower.Instance.CalculatePower(level);
+ return EquipFightPower.Instance.CalculatePower(mark);
}
}
Dictionary<int, EquipSlot> equipSlots = new Dictionary<int, EquipSlot>();
- public EquipSet(int level)
+ public EquipSet(int mark)
{
- this.level = level;
-
+ this.mark = mark;
for (var i = 1; i <= maxEquipCnt; i++)
{
equipSlots[i] = new EquipSlot(i);
diff --git a/Main/System/Equip/EquipSuitEffect.cs b/Main/System/Equip/EquipSuitEffect.cs
index 7e4bdd7..5a92e97 100644
--- a/Main/System/Equip/EquipSuitEffect.cs
+++ b/Main/System/Equip/EquipSuitEffect.cs
@@ -91,6 +91,8 @@
{
switch (format)
{
+ case ItemCellformat.Format_100x100:
+ return 1.1f;
case ItemCellformat.Format_80x80:
return 0.95f;
case ItemCellformat.Format_70x70:
diff --git a/Main/System/ItemTip/ItemTipUtility.cs b/Main/System/ItemTip/ItemTipUtility.cs
index fd63253..80fab85 100644
--- a/Main/System/ItemTip/ItemTipUtility.cs
+++ b/Main/System/ItemTip/ItemTipUtility.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, March 12, 2019
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/KnapSack/BackpackData.cs b/Main/System/KnapSack/BackpackData.cs
index d14ff60..20015b7 100644
--- a/Main/System/KnapSack/BackpackData.cs
+++ b/Main/System/KnapSack/BackpackData.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, July 31, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/KnapSack/New/CommonItemBaisc.cs b/Main/System/KnapSack/New/CommonItemBaisc.cs
index 67dafd7..3179118 100644
--- a/Main/System/KnapSack/New/CommonItemBaisc.cs
+++ b/Main/System/KnapSack/New/CommonItemBaisc.cs
@@ -3,368 +3,362 @@
using UnityEngine;
using UnityEngine.UI;
- public enum ItemCellformat
- {
- Format_84x84,
- Format_80x80,
- Format_70x70,
- Format_64x64,
- None,
+public enum ItemCellformat
+{
+ Format_100x100,
+ Format_84x84,
+ Format_80x80,
+ Format_70x70,
+ Format_64x64,
+ None,
+}
+
+public class CommonItemBaisc : MonoBehaviour
+{
+ [SerializeField] ItemCellformat m_Format;
+ public ItemCellformat format { get { return m_Format; } set { m_Format = value; } }
+
+ Image m_BgIcon;
+ private Image bgIcon {
+ get {
+ if (m_BgIcon == null)
+ {
+ LoadPrefab();
+ m_BgIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_BackGround");
+ }
+ return m_BgIcon;
+ }
}
- public class CommonItemBaisc : MonoBehaviour
- {
- [SerializeField] ItemCellformat m_Format;
- public ItemCellformat format { get { return m_Format; } set { m_Format = value; } }
-
- Image m_BgIcon;
- public Image bgIcon {
- get {
- if (m_BgIcon == null)
- {
- LoadPrefab();
- m_BgIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_BackGround");
- }
- return m_BgIcon;
+ Image m_ItemIcon;
+ private Image itemIcon {
+ get {
+ if (m_ItemIcon == null)
+ {
+ LoadPrefab();
+ m_ItemIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_Icon");
}
+ return m_ItemIcon;
}
+ }
- Image m_ItemIcon;
- public Image itemIcon {
- get {
- if (m_ItemIcon == null)
- {
- LoadPrefab();
- m_ItemIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_Icon");
- }
- return m_ItemIcon;
+
+ Image m_StateIcon;
+ public Image stateIcon {
+ get {
+ if (m_StateIcon == null)
+ {
+ LoadPrefab();
+ m_StateIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_State");
}
+ return m_StateIcon;
}
+ }
-
- Image m_StateIcon;
- public Image stateIcon {
- get {
- if (m_StateIcon == null)
- {
- LoadPrefab();
- m_StateIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_State");
- }
- return m_StateIcon;
+ Text m_CountText;
+ public Text countText {
+ get {
+ if (m_CountText == null)
+ {
+ LoadPrefab();
+ m_CountText = this.transform.GetComponent<Text>("Container_ItemCell/Txt_Count");
}
+ return m_CountText;
}
+ }
- Text m_CountText;
- public Text countText {
- get {
- if (m_CountText == null)
- {
- LoadPrefab();
- m_CountText = this.transform.GetComponent<Text>("Container_ItemCell/Txt_Count");
- }
- return m_CountText;
+ Button m_Button;
+ public Button button {
+ get {
+ if (m_Button == null)
+ {
+ LoadPrefab();
+ m_Button = this.GetComponent<Button>("Container_ItemCell");
}
+ return m_Button;
}
+ }
- Button m_Button;
- public Button button {
- get {
- if (m_Button == null)
- {
- LoadPrefab();
- m_Button = this.GetComponent<Button>("Container_ItemCell");
- }
- return m_Button;
- }
- }
+ // EquipSuitEffect m_SuitEffect;
+ // EquipSuitEffect suitEffect {
+ // get {
+ // if (m_SuitEffect == null)
+ // {
+ // LoadPrefab();
+ // //clone 浼氶�犳垚浜屾鍒涘缓
+ // m_SuitEffect = transform.GetComponentInChildren<EquipSuitEffect>();
+ // if (m_SuitEffect == null)
+ // m_SuitEffect = EquipSuitEffect.Create(transform as RectTransform);
+ // }
+ // return m_SuitEffect;
+ // }
+ // }
- EquipSuitEffect m_SuitEffect;
- EquipSuitEffect suitEffect {
- get {
- if (m_SuitEffect == null)
- {
- LoadPrefab();
- //clone 浼氶�犳垚浜屾鍒涘缓
- m_SuitEffect = transform.GetComponentInChildren<EquipSuitEffect>();
- if (m_SuitEffect == null)
- m_SuitEffect = EquipSuitEffect.Create(transform as RectTransform);
- }
- return m_SuitEffect;
- }
- }
-
- //鐗╁搧鍩虹鐗规晥锛堢墿鍝佽〃锛�
- ItemBaseEffect m_ItemBaseEffect;
- ItemBaseEffect itemBaseEffect {
- get {
+ //鐗╁搧鍩虹鐗规晥锛堢墿鍝佽〃锛�
+ ItemBaseEffect m_ItemBaseEffect;
+ ItemBaseEffect itemBaseEffect {
+ get {
+ if (m_ItemBaseEffect == null)
+ {
+ LoadPrefab();
+ //clone 浼氶�犳垚浜屾鍒涘缓
+ m_ItemBaseEffect = transform.GetComponentInChildren<ItemBaseEffect>();
if (m_ItemBaseEffect == null)
- {
- LoadPrefab();
- //clone 浼氶�犳垚浜屾鍒涘缓
- m_ItemBaseEffect = transform.GetComponentInChildren<ItemBaseEffect>();
- if (m_ItemBaseEffect == null)
- m_ItemBaseEffect = ItemBaseEffect.Create(transform as RectTransform);
- }
- return m_ItemBaseEffect;
+ m_ItemBaseEffect = ItemBaseEffect.Create(transform as RectTransform);
}
+ return m_ItemBaseEffect;
}
-
- public bool suitEffectDirty { get; set; }
-
- GameObject cellContainer;
- protected void LoadPrefab()
- {
- //clone 浼氶�犳垚浜屾鍒涘缓
- var tmp = transform.Find("Container_ItemCell");
- if (tmp != null)
- {
- cellContainer = tmp.gameObject;
- return;
- }
- if (cellContainer == null)
- {
- switch (format)
- {
- case ItemCellformat.Format_64x64:
- cellContainer = UIUtility.CreateWidget("ItemCell_64", "Container_ItemCell");
- break;
- case ItemCellformat.Format_70x70:
- cellContainer = UIUtility.CreateWidget("ItemCell_70", "Container_ItemCell");
- break;
- case ItemCellformat.Format_80x80:
- cellContainer = UIUtility.CreateWidget("ItemCell_80", "Container_ItemCell");
- break;
- case ItemCellformat.Format_84x84:
- cellContainer = UIUtility.CreateWidget("ItemCell_84", "Container_ItemCell");
- break;
- }
-
- if (cellContainer != null)
- {
- cellContainer.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
- cellContainer.transform.SetAsFirstSibling();
- }
- }
- }
-
- public int itemId { get; private set; }
- PackManager packModel { get { return PackManager.Instance; } }
- // EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
-
- /// <summary>
- /// 鍒濆鍖栨暟鎹� bool鍊肩敤鏉ュ垽鏂槸鍚﹂渶瑕佸睍绀鸿瘎鍒嗛珮浣庢垨鑰呰亴涓氶檺鍒�
- /// </summary>
- /// <param name="model"></param>
- /// <param name="isCompare"></param>
- public virtual void Init(ItemModel model, bool isCompare = false)
- {
- itemId = model.itemId;
- InitUI(model.guid, model.itemId, (ulong)model.count, model.score, model.isAuction, model.packType, isCompare, model.useDataDict);
- }
-
- /// <summary>
- /// 鍒濆鍖栨暟鎹紙棰勮锛�
- /// </summary>
- /// <param name="model"></param>
- public virtual void Init(ItemCellModel model)
- {
- itemId = model.itemId;
- InitUI(model.guid, model.itemId, model.count, model.score, false, model.packType, model.isCompare, model.useDataDic);
- }
-
- private void InitUI(string guid, int itemId, ulong count, int score, bool isAuction, PackType type, bool isCompare, Dictionary<int, List<int>> useDataDic)
- {
- var config = ItemConfig.Get(itemId);
- if (config == null) return;
-
- itemIcon.SetActive(true);
- bgIcon.SetActive(true);
- itemIcon.SetSprite(config.IconKey);
- ItemConfig itemConfig = ItemConfig.Get(itemId);
- // bgIcon.SetItemBackGround(ItemLogicUtility.Instance.GetItemQuality(itemId, useDataDic), itemConfig.QualityEchoType);
- // if (packModel.textCountShow.ContainsKey(itemId))
- // {
- // countText.SetActive(true);
- // countText.text = count > 1 ? packModel.textCountShow[itemId] + "x" + count : packModel.textCountShow[itemId];
- // }
- // else if (packModel.gameCashShow.Contains(itemId))
- // {
- // //浠ｉ噾鍒�
- // countText.SetActive(true);
- // countText.text = count > 1000000 ? UIHelper.ReplaceLargeNum(count / 100.0f) : (count / 100.0f).ToString("0.##");
- // }
- // else if (Array.IndexOf(packModel.textCountShow2, itemId) != -1)
- // {
- // countText.SetActive(true);
- // countText.text = UIHelper.ReplaceLargeNum(count * (ulong)config.EffectValueA1);
- // }
- // else
- // {
- countText.SetActive(count > 1);
- if (count > 1)
- {
- countText.text = UIHelper.ReplaceLargeNum((double)count);
- }
- // }
-
- suitEffect.Display(itemId, suitEffectDirty);
- suitEffectDirty = false;
- itemBaseEffect.Display(itemId);
-
- // var compareReslut = isCompare ? Compare(type, itemId, score, guid) : 0;
- // switch (compareReslut)
- // {
- // case -1:
- // stateIcon.SetActive(true);
- // stateIcon.SetSprite("EquipDownIcon");
- // break;
- // case 0:
- // stateIcon.SetActive(false);
- // break;
- // case 1:
- // stateIcon.SetActive(true);
- // stateIcon.SetSprite("EquipUpIcon");
- // break;
- // case 99:
- // stateIcon.SetActive(true);
- // stateIcon.SetSprite("EquipForbidIcon");
- // break;
- // }
- }
-
- /// <summary>
- /// 0 鐩哥瓑 99 绂佹姣旇緝 1 楂樿瘎鍒� -1 浣庤瘎鍒�
- /// </summary>
- /// <param name="itemId"></param>
- /// <param name="score"></param>
- /// <param name="isCompare"></param>
- /// <param name="compareSocre"></param>
- /// <returns></returns>
- // int Compare(PackType type, int itemId, int score, string guid)
- // {
- // if (type == PackType.Equip || type == PackType.DogzEquip)
- // {
- // return 0;
- // }
-
- // if (!ItemLogicUtility.Instance.IsJobCompatibleItem(itemId))
- // {
- // return 99;
- // }
-
- // var config = ItemConfig.Get(itemId);
- // if (config == null || config.EquipPlace == 0)
- // {
- // return 0;
- // }
-
- // var item = packModel.GetItemByGuid(guid);
- // //if (item != null && item.isAuction)
- // //{
- // // return 0;
- // //}
-
- // if (item != null && ItemLogicUtility.Instance.IsOverdue(guid))
- // {
- // return 99;
- // }
-
- // if (ItemLogicUtility.Instance.IsDogzEquip(itemId))
- // {
- // var compareSocre = GetDogzEquipScore(config.EquipPlace);
- // return score.CompareTo(compareSocre);
- // }
- // else if (ItemLogicUtility.Instance.IsSpiritWeapon(itemId))
- // {
- // return score.CompareTo(GetSpiritWeaponScore(config.EquipPlace));
- // }
- // else if (ItemLogicUtility.Instance.IsRealmEquip(itemId))
- // {
- // return equipModel.CompareToCurrent(guid);
- // }
- // else
- // {
- // return 0;
- // }
- // }
-
- // int GetDogzEquipScore(int equipPlace)
- // {
- // var dogzModel = ModelCenter.Instance.GetModel<DogzModel>();
- // ItemModel putOnModel = null;
- // dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz, equipPlace, out putOnModel);
- // return putOnModel == null ? 0 : putOnModel.score;
- // }
-
- // int GetSpiritWeaponScore(int equipPlace)
- // {
- // var spiritWeaponModel = ModelCenter.Instance.GetModel<SpiritWeaponModel>();
- // var guid = spiritWeaponModel.GetSpiritWeapon((RoleEquipType)equipPlace);
- // var item = packModel.GetItemByGuid(guid);
- // return item != null ? item.score : 0;
- // }
-
}
- public class ItemCellModel
+ // public bool suitEffectDirty { get; set; }
+
+ GameObject cellContainer;
+ protected void LoadPrefab()
{
- public string guid { get; private set; }
- public int itemId { get; private set; }
- public ulong count { get; private set; }
- public int score { get; private set; }
- public bool isCompare { get; private set; }
- public ItemConfig itemConfig { get { return ItemConfig.Get(itemId); } }
- public PackType packType { get; private set; }
- public Dictionary<int, List<int>> useDataDic { get; private set; }
-
-
- public ItemCellModel(int itemId, bool isPreview = false, ulong count = 0, string guid = "", PackType type = PackType.Deleted, bool isCompare = false, Dictionary<int, List<int>> useDataDic = null)
+ if (cellContainer != null)
+ return;
+ //clone 浼氶�犳垚浜屾鍒涘缓
+ var tmp = transform.Find("Container_ItemCell");
+ if (tmp != null)
{
- this.itemId = AdjustItemId(itemId);
- this.guid = guid;
- this.count = count;
- this.isCompare = isCompare;
- this.useDataDic = useDataDic;
- this.packType = type;
-
- //this.score = ItemLogicUtility.Instance.GetEquipScore(itemId, useDataDic, isPreview);
+ cellContainer = tmp.gameObject;
+ return;
}
-
- public ItemCellModel(int itemId)
+ if (cellContainer == null)
{
- this.itemId = AdjustItemId(itemId);
- this.guid = "";
- this.count = 0;
- this.isCompare = false;
- this.useDataDic = null;
- this.packType = PackType.Deleted;
- this.score = 0;
- }
-
- public ItemCellModel(int itemId, bool isPreview, ulong count)
- {
- this.itemId = AdjustItemId(itemId);
- this.guid = "";
- this.count = count;
- this.isCompare = false;
- this.useDataDic = null;
- this.packType = PackType.Deleted;
-
- //this.score = ItemLogicUtility.Instance.GetEquipScore(itemId, null, isPreview);
- }
-
- int AdjustItemId(int itemId)
- {
- var config = ItemConfig.Get(itemId);
- if (config != null && config.Effect1 == 220)
+ switch (format)
{
- return config.EffectValueA1;
+ case ItemCellformat.Format_64x64:
+ cellContainer = UIUtility.CreateWidget("ItemCell_64", "Container_ItemCell");
+ break;
+ case ItemCellformat.Format_70x70:
+ cellContainer = UIUtility.CreateWidget("ItemCell_70", "Container_ItemCell");
+ break;
+ case ItemCellformat.Format_80x80:
+ cellContainer = UIUtility.CreateWidget("ItemCell_80", "Container_ItemCell");
+ break;
+ case ItemCellformat.Format_84x84:
+ cellContainer = UIUtility.CreateWidget("ItemCell_84", "Container_ItemCell");
+ break;
+ case ItemCellformat.Format_100x100:
+ cellContainer = UIUtility.CreateWidget("ItemCell_100", "Container_ItemCell");
+ break;
}
- else
+
+ if (cellContainer != null)
{
- return itemId;
+ cellContainer.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
+ cellContainer.transform.SetAsFirstSibling();
}
}
-
}
+ public int itemId { get; private set; }
+ PackManager packModel { get { return PackManager.Instance; } }
+ // EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
+
+ /// <summary>
+ /// 鍒濆鍖栨暟鎹� bool鍊肩敤鏉ュ垽鏂槸鍚﹂渶瑕佸睍绀鸿瘎鍒嗛珮浣庢垨鑰呰亴涓氶檺鍒�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <param name="isCompare"></param>
+ public virtual void Init(ItemModel model, bool isCompare = false)
+ {
+ itemId = model.itemId;
+ InitUI(model.guid, model.itemId, (ulong)model.count, model.score, model.isAuction, model.packType, isCompare, model.useDataDict);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨暟鎹紙棰勮锛�
+ /// </summary>
+ /// <param name="model"></param>
+ public virtual void Init(ItemCellModel model)
+ {
+ itemId = model.itemId;
+ InitUI(model.guid, model.itemId, model.count, model.score, false, model.packType, model.isCompare, model.useDataDic);
+ }
+
+ private void InitUI(string guid, int itemId, ulong count, int score, bool isAuction, PackType type, bool isCompare, Dictionary<int, List<int>> useDataDic)
+ {
+ var config = ItemConfig.Get(itemId);
+ if (config == null) return;
+
+ itemIcon.SetActive(true);
+ bgIcon.SetActive(true);
+ itemIcon.SetSprite(config.IconKey);
+ ItemConfig itemConfig = ItemConfig.Get(itemId);
+ bgIcon.SetItemBackGround(ItemLogicUtility.Instance.GetItemQuality(itemId, useDataDic), itemConfig.QualityEchoType);
+ if (packModel.textCountShow.ContainsKey(itemId))
+ {
+ countText.SetActive(true);
+ countText.text = count > 1 ? packModel.textCountShow[itemId] + "x" + count : packModel.textCountShow[itemId];
+ }
+ else if (packModel.gameCashShow.Contains(itemId))
+ {
+ //浠ｉ噾鍒�
+ countText.SetActive(true);
+ countText.text = count > 1000000 ? UIHelper.ReplaceLargeNum(count / 100.0f) : (count / 100.0f).ToString("0.##");
+ }
+ else if (Array.IndexOf(packModel.textCountShow2, itemId) != -1)
+ {
+ countText.SetActive(true);
+ countText.text = UIHelper.ReplaceLargeNum(count * (ulong)config.EffectValueA1);
+ }
+ else
+ {
+ countText.SetActive(count > 1);
+ if (count > 1)
+ {
+ countText.text = UIHelper.ReplaceLargeNum((double)count);
+ }
+ }
+
+ // suitEffect.Display(itemId, suitEffectDirty);
+ // suitEffectDirty = false;
+ itemBaseEffect.Display(itemId);
+
+ var compareReslut = isCompare ? Compare(type, itemId, score, guid) : 0;
+ switch (compareReslut)
+ {
+ case -1:
+ stateIcon.SetActive(true);
+ stateIcon.SetSprite("EquipDownIcon");
+ break;
+ case 0:
+ stateIcon.SetActive(false);
+ break;
+ case 1:
+ stateIcon.SetActive(true);
+ stateIcon.SetSprite("EquipUpIcon");
+ break;
+ case 99:
+ stateIcon.SetActive(true);
+ stateIcon.SetSprite("EquipForbidIcon");
+ break;
+ }
+ }
+
+ // / <summary>
+ // / 0 鐩哥瓑 99 绂佹姣旇緝 1 楂樿瘎鍒� -1 浣庤瘎鍒�
+ // / </summary>
+ // / <param name="itemId"></param>
+ // / <param name="score"></param>
+ // / <param name="isCompare"></param>
+ // / <param name="compareSocre"></param>
+ // / <returns></returns>
+ int Compare(PackType type, int itemId, int score, string guid)
+ {
+ if (type == PackType.Equip || type == PackType.DogzEquip)
+ {
+ return 0;
+ }
+
+ //姝ゅ鍙兘鏄灏嗗崱
+ // if (!ItemLogicUtility.Instance.IsJobCompatibleItem(itemId))
+ // {
+ // return 99;
+ // }
+
+ var config = ItemConfig.Get(itemId);
+ if (config == null || config.EquipPlace == 0)
+ {
+ return 0;
+ }
+
+ var item = packModel.GetItemByGuid(guid);
+
+ if (item != null && ItemLogicUtility.Instance.IsOverdue(guid))
+ {
+ return 99;
+ }
+
+ if (ItemLogicUtility.Instance.IsRealmEquip(itemId))
+ {
+ return EquipModel.Instance.CompareToCurrent(guid);
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ // int GetDogzEquipScore(int equipPlace)
+ // {
+ // var dogzModel = ModelCenter.Instance.GetModel<DogzModel>();
+ // ItemModel putOnModel = null;
+ // dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz, equipPlace, out putOnModel);
+ // return putOnModel == null ? 0 : putOnModel.score;
+ // }
+
+ // int GetSpiritWeaponScore(int equipPlace)
+ // {
+ // var spiritWeaponModel = ModelCenter.Instance.GetModel<SpiritWeaponModel>();
+ // var guid = spiritWeaponModel.GetSpiritWeapon((RoleEquipType)equipPlace);
+ // var item = packModel.GetItemByGuid(guid);
+ // return item != null ? item.score : 0;
+ // }
+
+}
+
+public class ItemCellModel
+{
+ public string guid { get; private set; }
+ public int itemId { get; private set; }
+ public ulong count { get; private set; }
+ public int score { get; private set; }
+ public bool isCompare { get; private set; }
+ public ItemConfig itemConfig { get { return ItemConfig.Get(itemId); } }
+ public PackType packType { get; private set; }
+ public Dictionary<int, List<int>> useDataDic { get; private set; }
+
+
+ public ItemCellModel(int itemId, bool isPreview = false, ulong count = 0, string guid = "", PackType type = PackType.Deleted, bool isCompare = false, Dictionary<int, List<int>> useDataDic = null)
+ {
+ this.itemId = AdjustItemId(itemId);
+ this.guid = guid;
+ this.count = count;
+ this.isCompare = isCompare;
+ this.useDataDic = useDataDic;
+ this.packType = type;
+
+ //this.score = ItemLogicUtility.Instance.GetEquipScore(itemId, useDataDic, isPreview);
+ }
+
+ public ItemCellModel(int itemId)
+ {
+ this.itemId = AdjustItemId(itemId);
+ this.guid = "";
+ this.count = 0;
+ this.isCompare = false;
+ this.useDataDic = null;
+ this.packType = PackType.Deleted;
+ this.score = 0;
+ }
+
+ public ItemCellModel(int itemId, bool isPreview, ulong count)
+ {
+ this.itemId = AdjustItemId(itemId);
+ this.guid = "";
+ this.count = count;
+ this.isCompare = false;
+ this.useDataDic = null;
+ this.packType = PackType.Deleted;
+
+ //this.score = ItemLogicUtility.Instance.GetEquipScore(itemId, null, isPreview);
+ }
+
+ int AdjustItemId(int itemId)
+ {
+ var config = ItemConfig.Get(itemId);
+ if (config != null && config.Effect1 == 220)
+ {
+ return config.EffectValueA1;
+ }
+ else
+ {
+ return itemId;
+ }
+ }
+
+}
+
diff --git a/Main/System/KnapSack/New/ItemCell.cs b/Main/System/KnapSack/New/ItemCell.cs
index 488c701..cfe14d8 100644
--- a/Main/System/KnapSack/New/ItemCell.cs
+++ b/Main/System/KnapSack/New/ItemCell.cs
@@ -5,67 +5,18 @@
public class ItemCell : CommonItemBaisc
{
- private Button m_Reducebtn;
- public Button reducebtn {
- get {
- if (m_Reducebtn == null)
- {
- LoadPrefab();
- m_Reducebtn = this.transform.GetComponent<Button>("Container_ItemCell/Btn_Reduce");
- }
- return m_Reducebtn;
- }
- }
- Image m_AuctionIcon;
- public Image auctionIcon
- {
- get
- {
- if (m_AuctionIcon == null)
- {
- LoadPrefab();
- m_AuctionIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_Auction");
- }
- return m_AuctionIcon;
- }
- }
-
- Image m_TimeMark;
- public Image timeMark
- {
- get
- {
- if (m_TimeMark == null)
- {
- LoadPrefab();
- m_TimeMark = this.transform.GetComponent<Image>("Container_ItemCell/Img_Time");
- }
- return m_TimeMark;
- }
- }
public override void Init(ItemModel model, bool isCompare = false)
{
base.Init(model, isCompare);
- reducebtn.SetActive(false);
- auctionIcon.SetActive(false);
- // auctionIcon.SetActive(model.isAuction);
- // if (model.isAuction)
- // {
- // auctionIcon.SetSprite(ItemLogicUtility.Instance.IsOverdue(model.guid) ? "Item_Auction_3" : "Item_Auction_1");
- // }
- timeMark?.SetActive(model.config.Type == 145 && model.config.CDTime > 0);
}
public override void Init(ItemCellModel model)
{
base.Init(model);
- reducebtn.SetActive(false);
- auctionIcon.SetActive(false);
- timeMark?.SetActive(model.itemConfig.Type == 145 && model.itemConfig.CDTime > 0);
}
}
diff --git a/Main/System/Launch/LaunchWin.cs b/Main/System/Launch/LaunchWin.cs
index d677c70..f923b3c 100644
--- a/Main/System/Launch/LaunchWin.cs
+++ b/Main/System/Launch/LaunchWin.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, September 05, 2017
//--------------------------------------------------------
diff --git a/Main/System/Login/ServerBehaviour.cs b/Main/System/Login/ServerBehaviour.cs
index 370e972..928704a 100644
--- a/Main/System/Login/ServerBehaviour.cs
+++ b/Main/System/Login/ServerBehaviour.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/Login/ServerBehaviourGroup.cs b/Main/System/Login/ServerBehaviourGroup.cs
index 090e166..df7af1f 100644
--- a/Main/System/Login/ServerBehaviourGroup.cs
+++ b/Main/System/Login/ServerBehaviourGroup.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/Login/ServerData.cs b/Main/System/Login/ServerData.cs
index f368378..aefa345 100644
--- a/Main/System/Login/ServerData.cs
+++ b/Main/System/Login/ServerData.cs
@@ -1,5 +1,5 @@
锘�// //--------------------------------------------------------
-// // [Author]: 绗簩涓栫晫
+// // [Author]: 鐜╀釜娓告垙
// // [ Date ]: Wednesday, January 10, 2018
// //--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/Login/ServerGroupToggle.cs b/Main/System/Login/ServerGroupToggle.cs
index 16b4477..50dde56 100644
--- a/Main/System/Login/ServerGroupToggle.cs
+++ b/Main/System/Login/ServerGroupToggle.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index e20f566..7fa90ba 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -12,7 +12,7 @@
[SerializeField] AvatarCell avatarCell;
[SerializeField] Text playerNameText;
[SerializeField] Text powerText;
- [SerializeField] Text officialRankText;
+ [SerializeField] OfficialTitleCell officialRankText;
[SerializeField] Text goldText;
[SerializeField] Text sparText;
@@ -68,7 +68,7 @@
powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPoint);
break;
case PlayerDataType.RealmLevel:
- officialRankText.text = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel).Name;
+ officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
break;
case PlayerDataType.TotalExp:
case PlayerDataType.ExpPoint:
@@ -108,7 +108,7 @@
playerLevelText.text = PlayerDatas.Instance.baseData.LV.ToString();
powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPoint);
- officialRankText.text = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel).Name;
+ officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
ShowExp();
@@ -143,7 +143,7 @@
var taskConfig = TaskConfig.Get(task.TaskID);
taskText.text = taskConfig.TaskDescribe;
taskNumText.text = string.Format("({0}/{1})", task.CurValue, taskConfig.NeedValue);
- taskNumText.color = task.CurValue >= taskConfig.NeedValue ? UIHelper.GetUIColor(TextColType.NavyBrown) : UIHelper.GetUIColor(TextColType.Red);
+ taskNumText.color = task.CurValue >= taskConfig.NeedValue ? UIHelper.GetUIColor(TextColType.NavyYellow) : UIHelper.GetUIColor(TextColType.Red);
taskEffect.SetActive(TaskManager.Instance.GetMainTaskState() == 2);
awardIcon.SetSprite(ItemConfig.Get(taskConfig.AwardItemList[0][0]).IconKey);
awardCnt.text = taskConfig.AwardItemList[0][1].ToString();
diff --git a/Main/System/OfficialRank/OfficialTitleCell.cs b/Main/System/OfficialRank/OfficialTitleCell.cs
new file mode 100644
index 0000000..5fcb9d8
--- /dev/null
+++ b/Main/System/OfficialRank/OfficialTitleCell.cs
@@ -0,0 +1,131 @@
+锘縰sing System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+//瀹樿亴鍜岀О鍙凤細鏍规嵁鐢ㄦ埛閫夋嫨锛屼僵鎴寸О鍙风殑鎯呭喌涓嬩紭鍏堟樉绀虹О鍙�
+//缁勪欢榛樿鍙傝�冨ぇ灏忎负瀹樿亴鐨勫簳鍥惧ぇ灏�
+public class OfficialTitleCell : MonoBehaviour
+{
+ private void Awake()
+ {
+ //濡傛灉鏈夐渶瑕佹寜閽偣鍑婚�昏緫锛屽湪澶栧眰鍒涘缓锛屾澶勪笉澶勭悊鐐瑰嚮閫昏緫
+ LoadPrefab();
+
+ }
+
+
+ Transform m_OfficialRankObj;
+ private Transform officialRankObj
+ {
+ get
+ {
+ if (m_OfficialRankObj == null)
+ {
+ m_OfficialRankObj = this.GetComponent<Transform>("OfficialTitleCell/offcialRank");
+ }
+ return m_OfficialRankObj;
+ }
+ }
+
+
+ Text m_OfficialRankText;
+ private Text officialRankText
+ {
+ get
+ {
+ if (m_OfficialRankText == null)
+ {
+ m_OfficialRankText = this.GetComponent<Text>("OfficialTitleCell/offcialRank/text");
+ }
+ return m_OfficialRankText;
+ }
+ }
+
+ Image m_TitleImage;
+ private Image titleImage
+ {
+ get
+ {
+ if (m_TitleImage == null)
+ {
+ m_TitleImage = this.GetComponent<Image>("OfficialTitleCell/Img_Title");
+ }
+ return m_TitleImage;
+ }
+ }
+
+
+
+ UIFrame m_UIFrame;
+ private UIFrame titleUIFrame
+ {
+ get
+ {
+ if (m_UIFrame == null)
+ {
+ m_UIFrame = this.GetComponent<UIFrame>("OfficialTitleCell/Img_Title");
+ }
+ return m_UIFrame;
+ }
+ }
+
+
+ GameObject prefab;
+
+
+ protected void LoadPrefab()
+ {
+ if (prefab != null)
+ return;
+ var tmp = transform.Find("OfficialTitleCell");
+
+ if (tmp != null)
+ {
+ prefab = tmp.gameObject;
+ return;
+ }
+ prefab = UIUtility.CreateWidget("OfficialTitleCell", "OfficialTitleCell");
+
+ prefab.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
+ prefab.transform.SetAsFirstSibling();
+
+ }
+
+ public void InitUI(int offcialRank, int titleID)
+ {
+ if (titleID == 0)
+ {
+ officialRankObj.SetActive(true);
+ titleUIFrame.SetActive(false);
+ officialRankText.text = RealmConfig.Get(offcialRank).Name;
+ }
+ else
+ {
+ officialRankObj.SetActive(false);
+ titleUIFrame.SetActive(true);
+ titleUIFrame.enabled = false;
+ var titleConfig = DienstgradConfig.Get(titleID);
+ string imgStr = titleConfig.Image;
+ if (!FrameAnimationConfig.HasKey(imgStr))
+ {
+ titleImage.SetSprite(imgStr);
+ titleImage.SetNativeSize();
+ return;
+ }
+
+ if (UIFrameMgr.Inst.ContainsDynamicImage(imgStr))
+ {
+ titleUIFrame.ResetFrame(imgStr);
+
+ List<Sprite> spriteList = UIFrameMgr.Inst.GetDynamicImage(imgStr);
+ if (!spriteList.IsNullOrEmpty())
+ {
+ titleImage.rectTransform.sizeDelta = new Vector2(spriteList[0].rect.width, spriteList[0].rect.height);
+ }
+
+ titleUIFrame.enabled = true;
+ }
+ }
+ }
+
+}
diff --git a/Main/System/OfficialRank/OfficialTitleCell.cs.meta b/Main/System/OfficialRank/OfficialTitleCell.cs.meta
new file mode 100644
index 0000000..2fc688f
--- /dev/null
+++ b/Main/System/OfficialRank/OfficialTitleCell.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b31dab6b10749ee47959bb5f8807d9e5
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/PhantasmPavilion/AvatarCell.cs b/Main/System/PhantasmPavilion/AvatarCell.cs
index 5c08b7c..3240df7 100644
--- a/Main/System/PhantasmPavilion/AvatarCell.cs
+++ b/Main/System/PhantasmPavilion/AvatarCell.cs
@@ -4,7 +4,6 @@
//澶村儚妯″潡锛堟敮鎸佸抚鍔ㄧ敾鍜岀壒鏁堬級
public class AvatarCell : MonoBehaviour
{
- public float scale = 1.0f;
private void Awake()
{
@@ -12,7 +11,7 @@
}
ImageEx m_BgImage;
- public ImageEx bgImage
+ private ImageEx bgImage
{
get
{
@@ -25,7 +24,7 @@
}
ImageEx m_AvatarImage;
- public ImageEx avatarImage
+ private ImageEx avatarImage
{
get
{
@@ -38,7 +37,7 @@
}
ImageEx m_AvatarFrameImage;
- public ImageEx avatarFrameImage
+ private ImageEx avatarFrameImage
{
get
{
@@ -64,7 +63,7 @@
}
UIFrame m_AvatarUIFrame;
- public UIFrame avatarUIFrame
+ private UIFrame avatarUIFrame
{
get
{
@@ -77,7 +76,7 @@
}
UIFrame m_AvatarFrameUIFrame;
- public UIFrame avatarFrameUIFrame
+ private UIFrame avatarFrameUIFrame
{
get
{
@@ -90,7 +89,7 @@
}
UIEffect m_AvatarUIEffect;
- public UIEffect avatarUIEffect
+ private UIEffect avatarUIEffect
{
get
{
@@ -103,7 +102,7 @@
}
UIEffect m_AvatarFrameUIEffect;
- public UIEffect avatarFrameUIEffect
+ private UIEffect avatarFrameUIEffect
{
get
{
@@ -141,7 +140,6 @@
prefabRect.anchorMin = new Vector2(0.5f, 0.5f);
prefabRect.anchorMax = new Vector2(0.5f, 0.5f);
prefabRect.sizeDelta = new Vector2(parentRect.rect.width, parentRect.rect.height);
- prefabRect.localScale = new Vector3(scale, scale, scale);
}
}
diff --git a/Main/System/PhantasmPavilion/PhantasmPavilionModel.cs b/Main/System/PhantasmPavilion/PhantasmPavilionModel.cs
index 7051c11..f181461 100644
--- a/Main/System/PhantasmPavilion/PhantasmPavilionModel.cs
+++ b/Main/System/PhantasmPavilion/PhantasmPavilionModel.cs
@@ -470,7 +470,7 @@
public List<string> GetEmojiList(int id)
{
- var info = FaceConfig.GetEmojiPackList();
+ var info = FrameAnimationConfig.GetEmojiPackList();
if (info == null || !info.TryGetValue(id, out var list) || list == null)
return new List<string>();
return list;
diff --git a/Main/System/Redpoint/MainRedDot.cs b/Main/System/Redpoint/MainRedDot.cs
index 43510d3..468ede6 100644
--- a/Main/System/Redpoint/MainRedDot.cs
+++ b/Main/System/Redpoint/MainRedDot.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Thursday, November 16, 2017
//--------------------------------------------------------
diff --git a/Main/System/Redpoint/RedpointBehaviour.cs b/Main/System/Redpoint/RedpointBehaviour.cs
index 61a7734..4a1a3e3 100644
--- a/Main/System/Redpoint/RedpointBehaviour.cs
+++ b/Main/System/Redpoint/RedpointBehaviour.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, August 14, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/Skill/FlipScroll.cs b/Main/System/Skill/FlipScroll.cs
index 5bc3342..d7087a2 100644
--- a/Main/System/Skill/FlipScroll.cs
+++ b/Main/System/Skill/FlipScroll.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, September 11, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/Sound/SoundUtility.cs b/Main/System/Sound/SoundUtility.cs
index 5b75600..f727a0e 100644
--- a/Main/System/Sound/SoundUtility.cs
+++ b/Main/System/Sound/SoundUtility.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, January 30, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Main/System/Tip/PopConfirmWin.cs b/Main/System/Tip/PopConfirmWin.cs
index 0c6e755..f4048cc 100644
--- a/Main/System/Tip/PopConfirmWin.cs
+++ b/Main/System/Tip/PopConfirmWin.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, November 29, 2017
//--------------------------------------------------------
diff --git a/Main/System/Tip/ScrollTipWin.cs b/Main/System/Tip/ScrollTipWin.cs
index e99ffe1..81038c2 100644
--- a/Main/System/Tip/ScrollTipWin.cs
+++ b/Main/System/Tip/ScrollTipWin.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Saturday, October 07, 2017
//--------------------------------------------------------
diff --git a/Main/System/Tip/ToggleConfirmWin.cs b/Main/System/Tip/ToggleConfirmWin.cs
index 679dde6..41d1f6c 100644
--- a/Main/System/Tip/ToggleConfirmWin.cs
+++ b/Main/System/Tip/ToggleConfirmWin.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Saturday, December 02, 2017
//--------------------------------------------------------
diff --git a/Main/System/UIBase/UIBase.cs b/Main/System/UIBase/UIBase.cs
index e217d99..5e7feb5 100644
--- a/Main/System/UIBase/UIBase.cs
+++ b/Main/System/UIBase/UIBase.cs
@@ -9,9 +9,9 @@
public enum UILayer
{
Static, // 闈欐�乁I 閫傚悎鍋� 鎴樻枟 涓荤晫闈�
- Bottom, // 涓荤晫闈�
- Mid, // 鍔熻兘绐楀彛
- System, // 缃戠粶寮圭獥/鍏朵粬閲嶈寮圭獥
+ Bottom, // 閮ㄥ垎鐣岄潰鐗规畩澶勭悊灞傜骇鐢�
+ Mid, // 澶ч儴鍒嗗姛鑳界獥鍙ｉ兘鏀捐繖灞傦紝渚夸簬璺宠浆涓婁笅灞傜鐞嗭紙涓�涓晫闈㈠彲浠ュ悓鏃跺瓨鍦ㄥ涓級
+ System, // 缃戠粶寮圭獥锛屼俊鎭彁绀虹瓑锛屽叾浠栭噸瑕佸脊绐�
Loading, // 鍔犺浇鐣岄潰
}
--
Gitblit v1.8.0