From 7a4cd7ba8fef6b90b5f0a59fd09110241e4ecead Mon Sep 17 00:00:00 2001
From: zhangqiang <657634622@qq.com>
Date: Sat, 24 Oct 2020 14:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E5=94=AE=E5=93=81=E5=8D=87=E7=BA=A7?=
=?UTF-8?q?=E5=8D=87=E6=98=9F=E7=BA=A2=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Prefabs/UI/Main/MainPanel.prefab | 194 +++----
.../UI/Pokemon/PokemonMainPanel.prefab | 548 ++++++++++++++++--
.../~Lua/Common/GlobalDefine.lua | 7 +
.../FunctionOpenMananger.lua | 1 -
.../~Lua/Modules/Hero/HeroManager.lua | 6 +-
.../~Lua/Modules/Main/MainPanel.lua | 7 +
.../~Lua/Modules/Player/RedpotManager.lua | 12 +
.../~Lua/Modules/Pokemon/PokemonInfoPanel.lua | 32 +-
.../~Lua/Modules/Pokemon/PokemonMainPanel.lua | 10 +
.../~Lua/Modules/Pokemon/PokemonManager.lua | 164 +++++-
.../Pokemon/view/PokemonInfoPanel_UpLv.lua | 34 +-
.../Pokemon/view/PokemonInfoPanel_UpStar.lua | 32 +-
12 files changed, 866 insertions(+), 181 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
index 27d8c1e1c8..ebb9c5f285 100644
--- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
@@ -111,9 +111,9 @@ RectTransform:
m_Father: {fileID: 5352445832565045888}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 484.84, y: -36}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 98, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &348893785
@@ -1514,10 +1514,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -418, y: -345}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2186769594291666715
CanvasRenderer:
@@ -2659,8 +2659,8 @@ RectTransform:
m_Father: {fileID: 8252960618736938818}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 0}
- m_AnchorMax: {x: 1, y: 1}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 2, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
@@ -2884,10 +2884,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -566, y: -63}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6287752951030855709
MonoBehaviour:
@@ -8139,10 +8139,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -122, y: -63}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7360419264509299017
CanvasRenderer:
@@ -8923,9 +8923,9 @@ RectTransform:
m_Father: {fileID: 5352445832565045888}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 621.12, y: -36}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 98, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1256521596463652073
@@ -10039,10 +10039,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 26, y: -204}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2479300408203382036
MonoBehaviour:
@@ -10336,9 +10336,9 @@ RectTransform:
m_Father: {fileID: 5352445832565045888}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 348.56, y: -36}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 98, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5808588845638581693
@@ -22702,10 +22702,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -270, y: -204}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7336279358730734314
MonoBehaviour:
@@ -27627,7 +27627,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -68.899994, y: 18.7}
- m_SizeDelta: {x: 380, y: 70}
+ m_SizeDelta: {x: 0, y: 70}
m_Pivot: {x: 1, y: 0}
--- !u!114 &4265614787782436714
MonoBehaviour:
@@ -27886,10 +27886,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -418, y: -204}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3438001626827331599
CanvasRenderer:
@@ -28027,10 +28027,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 26, y: -345}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4639330549965109979
MonoBehaviour:
@@ -34654,10 +34654,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -566, y: -204}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4334068205332484872
MonoBehaviour:
@@ -51497,10 +51497,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -122, y: -345}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4680598596924174236
CanvasRenderer:
@@ -51607,10 +51607,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -122, y: -204}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4105940452316708500
MonoBehaviour:
@@ -57055,10 +57055,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 26, y: -486}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4795482968323619546
CanvasRenderer:
@@ -62809,9 +62809,9 @@ RectTransform:
m_Father: {fileID: 5352445832565045888}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 212.28, y: -36}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 98, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4403198427667689683
@@ -68401,10 +68401,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -418, y: -63}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &733495525651231946
MonoBehaviour:
@@ -68859,7 +68859,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
+ m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.4499817, y: 0.46502018}
m_SizeDelta: {x: 0.89996, y: 0.93}
m_Pivot: {x: 0.5, y: 0.5}
@@ -69462,10 +69462,10 @@ RectTransform:
m_Father: {fileID: 2608772048199405974}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 0, y: -35}
- m_SizeDelta: {x: 55, y: 68.95}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 300.5, y: 0}
+ m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4888453323599395195
CanvasRenderer:
@@ -71240,7 +71240,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 165, y: 503}
+ m_AnchoredPosition: {x: 165, y: 470}
m_SizeDelta: {x: 64, y: 186}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2549606708986302677
@@ -72606,9 +72606,9 @@ RectTransform:
m_Father: {fileID: 5352445832565045888}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 76, y: -36}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 98, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7443465253179528445
@@ -79288,10 +79288,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -566, y: -345}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1153722762668388965
CanvasRenderer:
@@ -79776,10 +79776,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 26, y: -63}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2658954599818822341
CanvasRenderer:
@@ -80187,7 +80187,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &986452627335843391
RectTransform:
m_ObjectHideFlags: 0
@@ -86998,10 +86998,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -270, y: -345}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5853232199602849243
CanvasRenderer:
@@ -97261,10 +97261,10 @@ RectTransform:
m_Father: {fileID: 2608772048199405974}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 0, y: -35}
- m_SizeDelta: {x: 52, y: 69.49}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 354, y: 0}
+ m_SizeDelta: {x: 0, y: 69.49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4199903939254402628
CanvasRenderer:
@@ -98623,10 +98623,10 @@ RectTransform:
m_Father: {fileID: 2608772048199405974}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 0, y: -35}
- m_SizeDelta: {x: 230, y: 68.95}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 158, y: 0}
+ m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6388664606995184780
CanvasRenderer:
@@ -100587,10 +100587,10 @@ RectTransform:
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -270, y: -63}
- m_SizeDelta: {x: 148, y: 126}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &186549464138162808
MonoBehaviour:
diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab
index 9ed0e6e3a3..e7de767cb5 100644
--- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab
@@ -1727,6 +1727,7 @@ RectTransform:
- {fileID: 1138644246316336040}
- {fileID: 4538095571535468136}
- {fileID: 4953285220026030186}
+ - {fileID: 1095497909085534417}
m_Father: {fileID: 7859614189852817728}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2637,6 +2638,7 @@ RectTransform:
- {fileID: 5854653386540402189}
- {fileID: 6508654139268765451}
- {fileID: 2647917300271374378}
+ - {fileID: 4074477920605335322}
m_Father: {fileID: 7859614190811820323}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3018,6 +3020,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &2414252189199031581
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5824347876907398701}
+ - component: {fileID: 2582998452793971771}
+ - component: {fileID: 2585720955047802125}
+ m_Layer: 5
+ m_Name: redPoint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5824347876907398701
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2414252189199031581}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 251703977544625893}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 175, y: 212}
+ m_SizeDelta: {x: 30, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2582998452793971771
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2414252189199031581}
+ m_CullTransparentMesh: 0
+--- !u!114 &2585720955047802125
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2414252189199031581}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &2536535404898371550
GameObject:
m_ObjectHideFlags: 0
@@ -3126,6 +3202,80 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!1 &2588858675140307893
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1774984884442651997}
+ - component: {fileID: 6199481135462372040}
+ - component: {fileID: 2182033074177088420}
+ m_Layer: 5
+ m_Name: redPoint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1774984884442651997
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2588858675140307893}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 589298262190833987}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 175, y: 212}
+ m_SizeDelta: {x: 30, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6199481135462372040
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2588858675140307893}
+ m_CullTransparentMesh: 0
+--- !u!114 &2182033074177088420
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2588858675140307893}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &2631878164153192616
GameObject:
m_ObjectHideFlags: 0
@@ -4338,6 +4488,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3675739402179890959}
m_CullTransparentMesh: 0
+--- !u!1 &3691348432133302122
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4074477920605335322}
+ - component: {fileID: 3454216812549508611}
+ - component: {fileID: 3061014970080026639}
+ m_Layer: 5
+ m_Name: redPoint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4074477920605335322
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3691348432133302122}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 694485758818668032}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 175, y: 212}
+ m_SizeDelta: {x: 30, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3454216812549508611
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3691348432133302122}
+ m_CullTransparentMesh: 0
+--- !u!114 &3061014970080026639
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3691348432133302122}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &3691582749851473875
GameObject:
m_ObjectHideFlags: 0
@@ -5967,7 +6191,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &2852318978939148568
RectTransform:
m_ObjectHideFlags: 0
@@ -6310,6 +6534,7 @@ RectTransform:
- {fileID: 8275000115917521042}
- {fileID: 6844656234637272249}
- {fileID: 7793218864354753712}
+ - {fileID: 4764750994296970780}
m_Father: {fileID: 7859614191081853139}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7499,6 +7724,80 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1.2
m_Text: "222\u7EA7\u89E3\u9501"
+--- !u!1 &6744102944304218036
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1095497909085534417}
+ - component: {fileID: 2892010963434664073}
+ - component: {fileID: 198590382265206559}
+ m_Layer: 5
+ m_Name: redPoint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1095497909085534417
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6744102944304218036}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 8500918224904449329}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 175, y: 212}
+ m_SizeDelta: {x: 30, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2892010963434664073
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6744102944304218036}
+ m_CullTransparentMesh: 0
+--- !u!114 &198590382265206559
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6744102944304218036}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &6766068287884764636
GameObject:
m_ObjectHideFlags: 0
@@ -8316,6 +8615,7 @@ RectTransform:
- {fileID: 179435921003468026}
- {fileID: 986847880638917472}
- {fileID: 683948111706364756}
+ - {fileID: 8332707998905615489}
m_Father: {fileID: 7859614190076236077}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8474,10 +8774,10 @@ RectTransform:
m_Father: {fileID: 5632829283226798929}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 1017.5, y: -38.5}
- m_SizeDelta: {x: 123, y: 123}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2625978376404045698
CanvasRenderer:
@@ -8577,6 +8877,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &7292718589659213835
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8332707998905615489}
+ - component: {fileID: 117735395959007663}
+ - component: {fileID: 7756198376018623469}
+ m_Layer: 5
+ m_Name: redPoint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8332707998905615489
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7292718589659213835}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 7060231474803325558}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 175, y: 212}
+ m_SizeDelta: {x: 30, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &117735395959007663
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7292718589659213835}
+ m_CullTransparentMesh: 0
+--- !u!114 &7756198376018623469
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7292718589659213835}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &7355392239095805224
GameObject:
m_ObjectHideFlags: 0
@@ -8685,6 +9059,80 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!1 &7369131280666931462
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4764750994296970780}
+ - component: {fileID: 2237513027376970712}
+ - component: {fileID: 7341213430270782054}
+ m_Layer: 5
+ m_Name: redPoint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4764750994296970780
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7369131280666931462}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1479700458860635584}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 175, y: 212}
+ m_SizeDelta: {x: 30, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2237513027376970712
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7369131280666931462}
+ m_CullTransparentMesh: 0
+--- !u!114 &7341213430270782054
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7369131280666931462}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &7374017734252998643
GameObject:
m_ObjectHideFlags: 0
@@ -9215,6 +9663,7 @@ RectTransform:
- {fileID: 5111757828807792649}
- {fileID: 1754052489659167387}
- {fileID: 7094383442899029305}
+ - {fileID: 1774984884442651997}
m_Father: {fileID: 7859614189110724872}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9411,10 +9860,10 @@ RectTransform:
m_Father: {fileID: 7859614189258735607}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 448, y: -1157.9}
- m_SizeDelta: {x: 400, y: 500}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4499455109871748351
CanvasRenderer:
@@ -9553,10 +10002,10 @@ RectTransform:
m_Father: {fileID: 5632829283226798929}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 617.69, y: -38.5}
- m_SizeDelta: {x: 123, y: 123}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7859614189585410598
CanvasRenderer:
@@ -9690,10 +10139,10 @@ RectTransform:
m_Father: {fileID: 7859614189258735607}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 929.32, y: -1698.8}
- m_SizeDelta: {x: 400, y: 500}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &559688128674590087
CanvasRenderer:
@@ -9766,10 +10215,10 @@ RectTransform:
m_Father: {fileID: 7859614189258735607}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 448, y: -617}
- m_SizeDelta: {x: 400, y: 500}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &395789774285708987
CanvasRenderer:
@@ -9842,10 +10291,10 @@ RectTransform:
m_Father: {fileID: 5632829283226798929}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 750.96, y: -38.5}
- m_SizeDelta: {x: 123, y: 123}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7859614190214280336
CanvasRenderer:
@@ -9979,10 +10428,10 @@ RectTransform:
m_Father: {fileID: 7859614189258735607}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 929.32, y: -617}
- m_SizeDelta: {x: 400, y: 500}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4826209148240724100
CanvasRenderer:
@@ -10055,10 +10504,10 @@ RectTransform:
m_Father: {fileID: 5632829283226798929}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 484.42, y: -38.5}
- m_SizeDelta: {x: 123, y: 123}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7859614190496320348
CanvasRenderer:
@@ -10192,10 +10641,10 @@ RectTransform:
m_Father: {fileID: 7859614189258735607}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 929.32, y: -1157.9}
- m_SizeDelta: {x: 400, y: 500}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &180940976784238415
CanvasRenderer:
@@ -10268,10 +10717,10 @@ RectTransform:
m_Father: {fileID: 5632829283226798929}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 884.23004, y: -38.5}
- m_SizeDelta: {x: 123, y: 123}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7859614190979638764
CanvasRenderer:
@@ -10405,10 +10854,10 @@ RectTransform:
m_Father: {fileID: 7859614189258735607}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 448, y: -1698.8}
- m_SizeDelta: {x: 400, y: 500}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5371495566325172163
CanvasRenderer:
@@ -10481,10 +10930,10 @@ RectTransform:
m_Father: {fileID: 5632829283226798929}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 351.15002, y: -38.5}
- m_SizeDelta: {x: 123, y: 123}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7859614191144760452
CanvasRenderer:
@@ -10837,6 +11286,7 @@ RectTransform:
- {fileID: 651755064599797586}
- {fileID: 499208422784050}
- {fileID: 6464040450448033587}
+ - {fileID: 5824347876907398701}
m_Father: {fileID: 7859614190227453057}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index cd542a6f6f..31f3ac896a 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -817,6 +817,13 @@ RedPointType = {
QinglongSerectTreasureTrail = 10008,
XiaoYaoYouRedPoint=10009,
+ --灵兽
+ PokemonMainCity = 790,--灵兽主界面
+ Pokemon_UpLv = 791,--灵兽升级
+ Pokemon_UpStar = 792,--灵兽升星
+ Pokemon_CanUpZhen = 793,--灵兽可上阵
+ Pokemon_Fetter = 794,--灵兽羁绊
+ Pokemon_Recruit = 795,--灵兽 御兽斋免费
}
diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua
index ef9ae0fc7b..497688e13c 100644
--- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua
@@ -39,7 +39,6 @@ end
-- 获取某一功能是否显示恶心的字
function this.GetModuleOpen(openId)
local isOpen = false
- LogPink("openId "..openId)
local saveValue = PlayerPrefs.GetInt(PlayerManager.uid .. FUNC_OPEN_STR[openId])
local funcOpen = ActTimeCtrlManager.IsQualifiled(openId)
isOpen = saveValue == 0 and funcOpen
diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
index 5a690df48d..f1de35433a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
@@ -1533,9 +1533,9 @@ function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid)
end
--灵兽编队加成
local pokemonFormationAllHeroProVal = PokemonManager.GetPokemonFormationTeamAddPro(heroAllNum)
- for key, value in pairs(pokemonFormationAllHeroProVal) do
- LogPink("灵兽编队加成 "..value)
- end
+ -- for key, value in pairs(pokemonFormationAllHeroProVal) do
+ -- LogPink("灵兽编队加成 "..value)
+ -- end
this.DoubleTableCompound(teamProVal, pokemonFormationAllHeroProVal)
--光环加成
local aureoleProAdd = FormationManager.GetCurFormationElementAdd(teamHeroInfos)
diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
index 6f495b03e4..0e0219569a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
@@ -319,6 +319,7 @@ function this:InitComponent()
this.rpAlien = Util.GetGameObject(this.btnWaiDi, "redPoint")
this.rpColorfulWorld = Util.GetGameObject(this.btnColorfulWorld, "redPoint")
this.rpCompoundHero = Util.GetGameObject(this.btnCompoundHero, "redPoint")--神将合成、置换
+ this.rpPokemon = Util.GetGameObject(this.btnPokemon, "redPoint")--灵兽
@@ -945,6 +946,8 @@ function this.BindRedPoint()
--BindRedPointObject(RedPointType.Achievement_Main, this.AchievementRedPoint)
BindRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
BindRedPointObject(RedPointType.DynamicActivity, this.DynamicActivityRedPoint)
+
+ BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
end
-- 绑定红点
function this.ClearRedPoint()
@@ -982,6 +985,7 @@ function this.ClearRedPoint()
--ClearRedPointObject(RedPointType.Achievement_Main, this.AchievementRedPoint)
ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
ClearRedPointObject(RedPointType.DynamicActivity, this.DynamicActivityRedPoint)
+ ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
end
--添加事件监听(用于子类重写)
@@ -1154,6 +1158,9 @@ function this:OnShow()
end
PlayerManager.StarBattleUpLvTipTime(1)
this.battleUpLvTip:SetActive(false)
+
+ --检测灵兽红点
+ PokemonManager.CheckRedPointStatusPokemonMainCityRed()
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
index ac60607bb1..1cbf102a6e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
@@ -255,6 +255,12 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.FindFairy_FourView, RedPointType.FindFairy)
-- 成就
RPData:SetParent(RedPointType.Achievement_Main, RedPointType.DailyTaskMain)
+ --灵兽
+ RPData:SetParent(RedPointType.Pokemon_UpLv, RedPointType.PokemonMainCity)
+ RPData:SetParent(RedPointType.Pokemon_UpStar, RedPointType.PokemonMainCity)
+ RPData:SetParent(RedPointType.Pokemon_CanUpZhen, RedPointType.PokemonMainCity)
+ RPData:SetParent(RedPointType.Pokemon_Fetter, RedPointType.PokemonMainCity)
+ RPData:SetParent(RedPointType.Pokemon_Recruit, RedPointType.PokemonMainCity)
end
-- 注册红点检测方法
@@ -426,6 +432,12 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.WeekGiftPage,OperatingManager.CheckWeekGiftPageRedPoint)
RPData:AddCheckFunc(RedPointType.MonthGiftPage,OperatingManager.CheckMonthGiftPageRedPoint)
RPData:AddCheckFunc(RedPointType.XiaoYaoYouRedPoint, XiaoYaoManager.CheckRedPoint, FUNCTION_OPEN_TYPE.XiaoYaoYou)
+ --灵兽
+ RPData:AddCheckFunc(RedPointType.Pokemon_UpLv,PokemonManager.RefreshPokemonUpLvRedPoint)
+ RPData:AddCheckFunc(RedPointType.Pokemon_UpStar,PokemonManager.RefreshPokemonUpStarRedPoint)
+ RPData:AddCheckFunc(RedPointType.Pokemon_CanUpZhen,PokemonManager.RefreshPokemonCanUpZhenRedPoint)
+ RPData:AddCheckFunc(RedPointType.Pokemon_Fetter,PokemonManager.RefreshPokemonFetterRedPoint)
+ RPData:AddCheckFunc(RedPointType.Pokemon_Recruit,PokemonManager.RefreshPokemonRecruitRedPoint)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua
index fd944574ef..fd1327c159 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua
@@ -29,6 +29,7 @@ this.contents = {
[1] = {view = require("Modules/Pokemon/view/PokemonInfoPanel_UpLv"), panelName = "PokemonInfoPanel_UpLv"},
[2] = {view = require("Modules/Pokemon/view/PokemonInfoPanel_UpStar"), panelName = "PokemonInfoPanel_UpStar"},
}
+local redPointList = {}
--初始化组件(用于子类重写)
function PokemonInfoPanel:InitComponent()
this.BtnBack = Util.GetGameObject(self.transform, "btnBack")
@@ -199,7 +200,13 @@ function PokemonInfoPanel:OnShow()
this.TabCtrl:SetTabAdapter(this.TabAdapter)
this.TabCtrl:SetChangeTabCallBack(this.SwitchView)
this.TabCtrl:Init(this.tabBox, _TabData,curIndex)
+ redPointList = {}
+ for i = 1, #_TabData do
+ local curTabBtn = Util.GetGameObject(this.tabBox, "box").transform:GetChild(i-1)
+ redPointList[i] = Util.GetGameObject(curTabBtn, "Redpot")
+ end
this.OnShowData()
+ this.OnShowRedPoint()
end
-- tab节点显示自定义
@@ -270,8 +277,8 @@ function this.OnShowData()
this.UpdateHeroInfoData()
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.LingShouUpLv })
FixedUpdateBeat:Add(this.OnUpdate, self)--长按方法注册
- this.replaceBtn:SetActive(upZhenDidis[curPokemonData.dynamicId])
- this.restBtn:SetActive(upZhenDidis[curPokemonData.dynamicId])
+ this.replaceBtn:SetActive(upZhenDidis[curPokemonData.dynamicId] ~= nil)
+ this.restBtn:SetActive(upZhenDidis[curPokemonData.dynamicId] ~= nil)
end
--长按升级处理
@@ -288,12 +295,12 @@ function this.UpdateLiveList()
curPokemonData = pokemonDatas[index]
local rightIndex = (index + 1 <= #pokemonDatas and index + 1 or 1)
rightPokemonData = pokemonDatas[rightIndex]
- LogPink(leftIndex.." "..index.." "..rightIndex)
+ -- LogPink(leftIndex.." "..index.." "..rightIndex)
end
--根据界面数据加载动态立绘
function this.LoadHerolive(_heroData, _objPoint)
--TODO:动态加载立绘
- LogPink("_heroData.id ".._heroData.id)
+ -- LogPink("_heroData.id ".._heroData.id)
local testLive = poolManager:LoadLive(GetResourcePath(spiritAnimal[_heroData.id].Live), _objPoint.transform,
Vector3.one * spiritAnimal[_heroData.id].Scale, Vector3.New(spiritAnimal[_heroData.id].Position[1], spiritAnimal[_heroData.id].Position[2], 0))
local SkeletonGraphic = testLive:GetComponent("SkeletonGraphic")
@@ -425,6 +432,22 @@ function this.OnEndDrag(Pointgo, data)
distance=0
end
+--刷新页签红点方法
+function this.RefreshRedPoint(tabType,isShow)
+ -- LogPink("刷新页签红点方法tabType "..tabType.." isShow "..tostring(isShow))
+ if redPointList[tabType] and redPointList[tabType].gameObject then
+ redPointList[tabType]:SetActive(isShow)
+ end
+end
+
+function this.OnShowRedPoint()
+ if redPointList[1] and redPointList[1].gameObject then
+ redPointList[1]:SetActive(PokemonManager.GetSinglePokemonUpLvRedPoint(curPokemonData))
+ end
+ if redPointList[2] and redPointList[2].gameObject then
+ redPointList[2]:SetActive(PokemonManager.GetSinglePokemonUpStarRedPoint(curPokemonData))
+ end
+end
--界面关闭时调用(用于子类重写)
function PokemonInfoPanel:OnClose()
for i = 1, #this.contents do
@@ -450,6 +473,7 @@ end
--界面销毁时调用(用于子类重写)
function PokemonInfoPanel:OnDestroy()
+ redPointList = {}
for i = 1, #this.contents do
this.contents[i].view:OnDestroy()
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua
index 23240e4063..e5d1225e0d 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua
@@ -3,11 +3,13 @@ local PokemonMainPanel = Inherit(BasePanel)
local this = PokemonMainPanel
local PokemonList = {}
local PokemonGoList = {}
+local PokemonGoListRedPoin = {}
local PokemonDataList = {}
local live2dList = {}
local dragViewListGo={}--dragView预设列表
local pokemonPosLocks = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSetting,1).BlockUnlockLevel
+local canUpZhenPokemonList = {}
this.trigger = {}
--初始化组件(用于子类重写)
function PokemonMainPanel:InitComponent()
@@ -25,6 +27,7 @@ function PokemonMainPanel:InitComponent()
for i = 1, 6 do
PokemonList[i] = Util.GetGameObject(self.transform, "PokemonList/singlePokemon (".. i ..")")
PokemonGoList[i] = Util.GetGameObject(PokemonList[i], "pokemon".. i)
+ PokemonGoListRedPoin[i] = Util.GetGameObject(PokemonGoList[i], "redPoint")
Util.GetGameObject( PokemonGoList[i], "upZhenInfo/titleImage/sortText"):GetComponent("Text").text = i
Util.GetGameObject( PokemonGoList[i], "addInfo/addInfo/sortText"):GetComponent("Text").text = i
@@ -103,6 +106,7 @@ local nextOpenLockIndex = 0
function this.ShowPokemonList()
this.line.transform:SetParent(this.roleGrid.transform)
this.line.gameObject:SetActive(false)
+ canUpZhenPokemonList = PokemonManager.GetCanUpZhenPokemonDatas()
nextOpenLockIndex = 0
PokemonDataList = PokemonManager.GetAllPokemonFormationData()
for i = 1, #PokemonList do
@@ -138,6 +142,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
end
dragViewListGo[liveIndex].gameObject:SetActive(false)
+ PokemonGoListRedPoin[liveIndex]:SetActive(false)
if state == 1 then
--什么都不用做
go:SetActive(false)
@@ -149,12 +154,17 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
end)
elseif state == 3 then
addInfo:SetActive(true)
+ PokemonGoListRedPoin[liveIndex]:SetActive(#canUpZhenPokemonList > 0)
Util.AddOnceClick( Util.GetGameObject(go, "addInfo/addInfo/addClick"..liveIndex), function()
UIManager.OpenPanel(UIName.PokemonListPanel,Pokemon_Popup_Type.PokemonListPanel_UpWar,nil,liveIndex)
end)
elseif state == 4 then
local curData = PokemonManager.GetSinglePokemonData( singleData.pokemonId)
dragViewListGo[liveIndex].gameObject:SetActive(true)
+ local upLvRed = PokemonManager.GetSinglePokemonUpLvRedPoint(curData)
+ local upStarRed = PokemonManager.GetSinglePokemonUpStarRedPoint(curData)
+ LogPink("liveIndex "..liveIndex.." upLvRed "..tostring(upLvRed).." upStarRed "..tostring(upStarRed))
+ PokemonGoListRedPoin[liveIndex]:SetActive(upLvRed or upStarRed)
upZhenInfo:SetActive(true)
Util.GetGameObject(go, "upZhenInfo/titleImage/nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,curData.id).Name
Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = "等级"..curData.lv
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
index 8e0f6b9abb..e31beeef5a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
@@ -71,7 +71,7 @@ function this.GetCanUpZhenPokemonDatas()
local upZhenSidList = this.GetAllPokemonFormationSids()
local curAllPokemonList = {}
for key, value in pairs(pokemons) do
- if value.isZhen == false and not upZhenSidList[value.id] then
+ if not upZhenSidList[value.id] then
table.insert(curAllPokemonList,value)
end
end
@@ -104,9 +104,9 @@ function this.GetNoUpLvPokemonData(_id,_did)
end
--获取单个灵兽属性 (灵兽属性/编队人数 灵兽属性会平分给上阵的所有神将)
function this.GetSinglePokemonAddProData(_did,_star)--_star 传值的话就用此星级计算属性
- LogPink("_did 1 ".._did)
+ -- LogPink("_did 1 ".._did)
if not pokemons[_did] then return end
- LogPink("_did 2 ".._did)
+ -- LogPink("_did 2 ".._did)
local addAllProVal = {}
local curPokeonData = pokemons[_did]
local curPokemonConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,curPokeonData.id)
@@ -297,11 +297,11 @@ function this.UpdatePokemonFormationDatas(_msgPokemonFormationList)
end
--获取变队形信息
function this.GetAllPokemonFormationData()
- for i = 1, #pokemonFormation do
- if pokemonFormation[i].pokemonId then
- LogPink("pokemonFormation[i].pokemonId "..pokemonFormation[i].position.." "..pokemonFormation[i].pokemonId)
- end
- end
+ -- for i = 1, #pokemonFormation do
+ -- if pokemonFormation[i].pokemonId then
+ -- LogPink("pokemonFormation[i].pokemonId "..pokemonFormation[i].position.." "..pokemonFormation[i].pokemonId)
+ -- end
+ -- end
return pokemonFormation
end
--获取编队灵兽静态id list
@@ -366,4 +366,152 @@ function this.PiaoWarPowerChange(oldWarPower,newWarPower)
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = newWarPower})--,pos=Vector3.New(-467,837.2),duration=0.7,isShowBg=false,isShowOldNum=false,pivot=Vector2.New(0,0.5)})
end
end
+
+
+---------------------------------------------
+--红点检测
+---------------------------------------------
+--灵兽红点检测方法
+function this.CheckRedPointStatusPokemonMainCityRed()
+ LogPink("sssssssssssssssssssssssss")
+ CheckRedPointStatus(RedPointType.Pokemon_UpLv)
+ CheckRedPointStatus(RedPointType.Pokemon_UpStar)
+ CheckRedPointStatus(RedPointType.Pokemon_CanUpZhen)
+end
+--上阵灵兽升级红点
+function this.RefreshPokemonUpLvRedPoint()
+ local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.POKEMON)
+ if not isOpen then
+ LogPink("灵兽升级红点 false")
+ return false
+ end
+ for i = 1, #pokemonFormation do
+ if pokemonFormation[i] and pokemonFormation[i].pokemonId then
+ local curPokemonData = pokemons[pokemonFormation[i].pokemonId]
+ if curPokemonData then
+ local singlePokemonPoint = this.GetSinglePokemonUpLvRedPoint(curPokemonData)
+ if singlePokemonPoint then
+ LogPink("灵兽升级红点 true")
+ return true
+ end
+ end
+ end
+ end
+ LogPink("灵兽升级红点 false")
+ return false
+end
+--上阵灵兽升级红点2
+function this.GetSinglePokemonUpLvRedPoint(curPokemonData)
+ local pokemonConFig = spiritAnimal[curPokemonData.id]
+ local upLvConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalLevel,"Quality",pokemonConFig.Quality,"Level",curPokemonData.lv + 1)
+ if upLvConFig then
+ local canUpLv = true
+ for j = 1, #upLvConFig.Consume do
+ local curMaterialBagNum = BagManager.GetItemCountById(upLvConFig.Consume[j][1])
+ if curMaterialBagNum < upLvConFig.Consume[j][2] then
+ canUpLv = false
+ end
+ end
+ if canUpLv then
+ LogPink("灵兽升级红点 true")
+ return true
+ end
+ end
+ return false
+end
+--上阵灵兽升星红点
+function this.RefreshPokemonUpStarRedPoint()
+ local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.POKEMON)
+ if not isOpen then
+ LogPink("灵兽升星红点 false")
+ return false
+ end
+ for i = 1, #pokemonFormation do
+ if pokemonFormation[i] and pokemonFormation[i].pokemonId then
+ local curPokemonData = pokemons[pokemonFormation[i].pokemonId]
+ local singlePokemonPoint = this.GetSinglePokemonUpStarRedPoint(curPokemonData)
+ if singlePokemonPoint then
+ LogPink("灵兽升星红点 true")
+ return true
+ end
+ end
+ end
+ LogPink("灵兽升星红点 false")
+ return false
+end
+--上阵灵兽升星红点2
+function this.GetSinglePokemonUpStarRedPoint(curPokemonData)
+ if curPokemonData and curPokemonData.star < spiritAnimal[curPokemonData.id].MaxStar then
+ local curUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star + 1)
+ if curUpStarConfig then
+ local upStarMaterialsData = {{curPokemonData.id,curUpStarConfig.ConsumeItemNum}}
+ for j = 1, #curUpStarConfig.ConsumeRes do
+ table.insert(upStarMaterialsData,curUpStarConfig.ConsumeRes[j])
+ end
+ local isCanUpStar = true
+ for k = 1, #upStarMaterialsData do
+ if upStarMaterialsData[k] then
+ local configMaterialId = upStarMaterialsData[k][1]
+ local configMaterialNum = upStarMaterialsData[k][2]
+ local curMaterialBagNum
+ if k == 1 then--需要的灵兽
+ local NoUpLvPokemonData = PokemonManager.GetNoUpLvPokemonData(curPokemonData.id,curPokemonData.dynamicId)
+ curMaterialBagNum = LengthOfTable(NoUpLvPokemonData)
+ elseif k >= 2 then--需要的材料
+ curMaterialBagNum = BagManager.GetItemCountById(upStarMaterialsData[k][1])
+ end
+ if curMaterialBagNum < configMaterialNum then
+ isCanUpStar = false
+ end
+ end
+ end
+ if isCanUpStar then
+ LogPink("灵兽升星红点 true")
+ return true
+ end
+ end
+ end
+ return false
+end
+--可以上阵灵兽红点
+function this.RefreshPokemonCanUpZhenRedPoint()
+ local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.POKEMON)
+ if not isOpen then
+ LogPink("上阵灵兽红点 false")
+ return false
+ end
+ local canPokemonList = this.GetCanUpZhenPokemonDatas()
+ if #canPokemonList <= 0 then
+ LogPink("灵兽上阵灵兽红点 false")
+ return false
+ end
+ local pokemonPosLocks = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSetting,1).BlockUnlockLevel
+ for i = 1, 6 do
+ local state = 1--1 未解锁 隐藏 2 即将解锁 3 已解锁 未上阵 4 已解锁 已上阵
+ if pokemonPosLocks[i] <= PlayerManager.level then
+ state = 3
+ if pokemonFormation[i] and pokemonFormation[i].pokemonId then
+ state = 4
+ end
+ else
+ state = 2
+ end
+ if state == 3 and #canPokemonList > 0 then
+ LogPink("灵兽上阵灵兽红点 true")
+ return true
+ end
+ end
+ LogPink("灵兽上阵灵兽红点 false")
+ return false
+end
+
+--可激活的羁绊
+function this.RefreshPokemonFetterRedPoint()
+
+end
+
+--免费抽卡次数
+function this.RefreshPokemonRecruitRedPoint()
+
+end
return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua
index 4a1c9aa284..1dfbdcdac1 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua
@@ -16,7 +16,7 @@ local curPokemonData = {}
local proList = {}
local oldLv
local allAddProVal
-
+local parent
local isMaterial = 0--升级材料是否充足
local isLvEnd = false--是否满级
local curUpLvConsume = {}--升级材料
@@ -69,10 +69,10 @@ this._onPointerDown = function(Pointgo, data)
end
--长按升级抬起状态
this._onPointerUp = function(Pointgo, data)
- LogPink("连续升级抬起请求升级 "..tostring(_isLongPress))
+ -- LogPink("连续升级抬起请求升级 "..tostring(_isLongPress))
if _isLongPress then--and isTriggerLongClick
--连续升级抬起请求升级
- LogPink("连续升级抬起请求升级 ")
+ -- LogPink("连续升级抬起请求升级 ")
this.LongLvUpClick(oldLv)
end
_isClicked = false
@@ -92,6 +92,7 @@ function this.OnSortingOrderChange(_sortingOrder)
sortingOrder = _sortingOrder
end
function this:OnShow(_parent,_pokemonData)
+ parent = _parent
curPokemonData = _pokemonData
this.ShowPokemonInfo()
end
@@ -102,7 +103,7 @@ function this.OnUpdate()
if _isClicked then
if Time.realtimeSinceStartup - this.timePressStarted > 0.4 then
_isLongPress = true
- LogPink("_isReqLvUp "..tostring(_isReqLvUp))
+ -- LogPink("_isReqLvUp "..tostring(_isReqLvUp))
if not _isReqLvUp then
_isReqLvUp = true
this.LvUpClick(false)
@@ -135,7 +136,7 @@ function this.ShowPokemonInfo()
end
--技能
local curSkillId = PokemonManager.GetCurStarSkillId(curPokemonData.id,curPokemonData.star)
- LogPink("curPokemonData.star "..curPokemonData.star)
+ -- LogPink("curPokemonData.star "..curPokemonData.star)
local skillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
if skillConFig then
this.skillIcon.sprite = Util.LoadSprite(GetResourcePath(skillConFig.Icon))
@@ -154,18 +155,29 @@ function this.ShowPokemonInfo()
isLvEnd = false
if not upLvConFig then
isLvEnd = true
+ parent.RefreshRedPoint(1,false)
+ this.upLvBtnRedPoint:SetActive(false)
return
end
if upLvConFig.Consume then
this.materialView:OnOpen(false, {upLvConFig.Consume[1][1],0}, 0.97)
end
curUpLvConsume = upLvConFig.Consume
- local curMaterialBagNum = BagManager.GetItemCountById(upLvConFig.Consume[1][1])
- if curMaterialBagNum >= upLvConFig.Consume[1][2] then
- this.upLvItemParentText.text = string.format("%s/%s",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[1][2]))
+ for i = 1, #curUpLvConsume do
+ local curMaterialBagNum = BagManager.GetItemCountById(upLvConFig.Consume[i][1])
+ if curMaterialBagNum >= upLvConFig.Consume[i][2] then
+ this.upLvItemParentText.text = string.format("%s/%s",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[i][2]))
+ else
+ isMaterial = upLvConFig.Consume[i][1]
+ this.upLvItemParentText.text = string.format("%s/%s",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[i][2]))
+ end
+ end
+ if isMaterial ~= 0 then
+ parent.RefreshRedPoint(1,false)
+ this.upLvBtnRedPoint:SetActive(false)
else
- isMaterial = upLvConFig.Consume[1][1]
- this.upLvItemParentText.text = string.format("%s/%s",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[1][2]))
+ parent.RefreshRedPoint(1,true)
+ this.upLvBtnRedPoint:SetActive(true)
end
end
--长按升级结束后请求协议
@@ -183,7 +195,7 @@ end
--升级按钮点击事件处理
function this.LvUpClick(isSingleLvUp)
--各种判断能否升级
- LogPink("isMaterial "..isMaterial)
+ -- LogPink("isMaterial "..isMaterial)
if isMaterial ~= 0 then
PopupTipPanel.ShowTip("【"..ConfigManager.GetConfigData(ConfigName.ItemConfig,isMaterial).Name.."】不足!")
return
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua
index 69f4235b15..684ee62788 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua
@@ -5,6 +5,7 @@ local isHeroUpStar=false--是否可升星
local isUpStarMaterials=0--升星 材料是否充足
local upStarMaterialsPre = {}
local curPokemonData = {}
+local parent
local spiritAnimal = ConfigManager.GetConfig(ConfigName.SpiritAnimal)
function this:InitComponent(gameObject)
Util.GetGameObject(gameObject,"PokemonInfoPanel_UpStar/upStar/Image (1)/Text"):GetComponent("Text").text = "灵兽提升"
@@ -26,6 +27,7 @@ function this:InitComponent(gameObject)
this.skillTip = Util.GetGameObject(gameObject,"PokemonInfoPanel_UpStar/upStar/tip"):GetComponent("Text")
this.upStarBtn = Util.GetGameObject(gameObject,"PokemonInfoPanel_UpStar/upStar/upStarBtn")
+ this.upStarBtnRedPoint = Util.GetGameObject(this.upStarBtn,"redPoint")
this.upStar = Util.GetGameObject(gameObject,"PokemonInfoPanel_UpStar/upStar")
this.noUpStarText = Util.GetGameObject(gameObject,"PokemonInfoPanel_UpStar/noUpStarText")
@@ -52,6 +54,7 @@ function this:OnSortingOrderChange(_sortingOrder)
sortingOrder = _sortingOrder
end
function this:OnShow(_parent,_pokemonData)
+ parent = _parent
curPokemonData = _pokemonData
this.OnShowData()
end
@@ -65,11 +68,15 @@ local curUpStarSelectPokemonData = {}
function this.OnShowData()
--curPokemonData
local curUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star)
- local nextUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star + 1)
- LogPink("curPokemonData.star + 1) "..curPokemonData.star + 1)
+ local nextUpStarConfig = nil
+ if curPokemonData.star < spiritAnimal[curPokemonData.id].MaxStar then
+ nextUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star + 1)
+ end
if not nextUpStarConfig then
this.upStar:SetActive(false)
this.noUpStarText:SetActive(true)
+ parent.RefreshRedPoint(2,false)
+ this.upStarBtnRedPoint:SetActive(false)
return
else
this.upStar:SetActive(true)
@@ -88,7 +95,7 @@ function this.OnShowData()
if skillArray[i][1] == curUpStarConfig.Star then
curSkillId = skillArray[i][2]
end
- if skillArray[i][1] == nextUpStarConfig.Star and nextUpStarConfig.Star <= spiritAnimal[curPokemonData.id].MaxStar then
+ if skillArray[i][1] == nextUpStarConfig.Star then
nextSkillId = skillArray[i][2]
nextSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,nextSkillId)
this.skill2Icon.sprite = Util.LoadSprite(GetResourcePath(nextSkillConFig.Icon))
@@ -104,7 +111,10 @@ function this.OnShowData()
this.skillTip.text = "已满星"
end
- local upStarMaterialsData = {{curPokemonData.id,curUpStarConfig.ConsumeItemNum},curUpStarConfig.ConsumeRes[1]}
+ local upStarMaterialsData = {{curPokemonData.id,curUpStarConfig.ConsumeItemNum}}
+ for i = 1, #curUpStarConfig.ConsumeRes do
+ table.insert(upStarMaterialsData,curUpStarConfig.ConsumeRes[i])
+ end
isUpStarMaterials = 0
for i = 1, #upStarMaterialsPre do
local itemParent = Util.GetGameObject(upStarMaterialsPre[i],"itemParent")
@@ -121,11 +131,11 @@ function this.OnShowData()
curMaterialBagNum = LengthOfTable(NoUpLvPokemonData)
for i = 1, #NoUpLvPokemonData do
if i <= configMaterialNum then
- LogPink("NoUpLvPokemonData[i].dynamicId "..NoUpLvPokemonData[i].dynamicId)
+ -- LogPink("NoUpLvPokemonData[i].dynamicId "..NoUpLvPokemonData[i].dynamicId)
table.insert(curUpStarSelectPokemonData,NoUpLvPokemonData[i].dynamicId)
end
end
- elseif i == 2 then--需要的材料
+ elseif i >= 2 then--需要的材料
curMaterialBagNum = BagManager.GetItemCountById(upStarMaterialsData[i][1])
end
if curMaterialBagNum < configMaterialNum then
@@ -143,7 +153,13 @@ function this.OnShowData()
end
end
-
+ if isUpStarMaterials ~= 0 then
+ parent.RefreshRedPoint(2,false)
+ this.upStarBtnRedPoint:SetActive(false)
+ else
+ parent.RefreshRedPoint(2,true)
+ this.upStarBtnRedPoint:SetActive(true)
+ end
end
@@ -159,7 +175,7 @@ end
--进阶按钮点击事件处理
function this.StarUpClick()
- LogPink("isUpStarMaterials "..isUpStarMaterials)
+ -- LogPink("isUpStarMaterials "..isUpStarMaterials)
if isUpStarMaterials ~= 0 then
PopupTipPanel.ShowTip("【"..ConfigManager.GetConfigData(ConfigName.ItemConfig,isUpStarMaterials).Name.."】不足!")
return