From 95adcb6b1d677c65700ebf737131f86c92d7078a Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 13:39:23 +0800 Subject: [PATCH 01/29] =?UTF-8?q?Revert=20"=E3=80=90=E5=AF=BB=E5=AE=9D?= =?UTF-8?q?=E8=BF=B7=E8=B8=AA=E3=80=91=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 31304cc25259f3af21b8c65dcb36ba4cee137b3e. --- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 2 +- .../~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 220f3c5cce..1980b9183c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -62,7 +62,7 @@ end function ActivityMainPanel:CheckActOpen(_index) for i = 1, #tabs do - if tabs[i].Sort == tabs[_index].Sort then + if tabs[i].Sort == _index then _index = i end end diff --git a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua index 843a46b799..8b60a5e982 100644 --- a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua @@ -48,7 +48,6 @@ function XunBaoMiZongMap:BindEvent() self.effect:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(self.rewardPos.x, self.rewardPos.y, 10) self.effect:SetActive(true) self.btnGet.gameObject:GetComponent("Button").interactable = false - self.btnBack.gameObject:GetComponent("Button").interactable = false cantWalk = true SoundManager.PlaySound("UI_021") Timer.New(function () @@ -87,7 +86,6 @@ function XunBaoMiZongMap:OnShow() end cantWalk = true self.btnGet.gameObject:GetComponent("Button").interactable = true - self.btnBack.gameObject:GetComponent("Button").interactable = true self.liveNode = PlayerLiveView:New(self.roleRoot,1) self.liveNode:OnOpen(300,Vector3.zero,WALK_DIR.IDLE_FRONT) self.liveNode:SetTitleHide() @@ -216,7 +214,7 @@ function XunBaoMiZongMap:SetRoleWalk(_targetPos,_fuv) cantWalk = true self:DoCheckDistance() self.timeCount = self.timeCount + 1 - if self.timeCount%10 == 0 then + if self.timeCount%20 == 0 then SoundManager.PlaySound("Footsteps_Run_07",false) end end):OnComplete(function () From f035b30e59302b31e96db7eb1e779eeb23601b15 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 13:43:10 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E8=BF=B7?= =?UTF-8?q?=E8=B8=AA=E3=80=91tip=E9=81=AE=E7=9B=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab index 06b4299c3c..b78d742982 100644 --- a/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab @@ -926,7 +926,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: 0, y: -523} + m_AnchoredPosition: {x: 30, y: -523} m_SizeDelta: {x: 500, y: 69.38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &498499350345767723 From 537af282e63ad271ec22647c48c13a06961b9d3e Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 14:05:07 +0800 Subject: [PATCH 03/29] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E8=BF=B7?= =?UTF-8?q?=E8=B8=AA=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NewActivity/CommonActPageManager.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index dfe3671e34..50c9ff0e73 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -201,9 +201,8 @@ local TypeUpdateFunc = { end, [ActivityTypeDef.XunBaoMiZong] = function () --寻宝迷踪 local curData = dataList[ActivityTypeDef.XunBaoMiZong] - local MergePool = ConfigManager.GetConfigDataByKey(ConfigName.LotterySetting,"ActivityId",curData.activityId).MergePool - local Pool = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",MergePool).pool_id - local rewards = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",Pool) + local DiamondBoxContain = ConfigManager.GetConfigDataByKey(ConfigName.LotterySetting,"ActivityId",curData.activityId).DiamondBoxContain[1][1] + local rewards = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",DiamondBoxContain) local weightAll = 0 for i = 1, #rewards do weightAll = weightAll + rewards[i].WeightShow From 415eb7a9473cc8b322a8722b0d4f9248ce4a5a7b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 16 Sep 2021 14:06:37 +0800 Subject: [PATCH 04/29] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E8=BF=B7?= =?UTF-8?q?=E8=B8=AA=E3=80=91=E5=AF=BB=E5=AE=9D=E8=BF=94=E5=9B=9E=E5=90=8E?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BF=94=E5=9B=9E=E6=98=BE=E7=A4=BA=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=AC=AC=E4=B8=80=E4=B8=AA=E9=A1=B5=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/DynamicActivity/ActivityMainPanel.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 1980b9183c..e445f0b98f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -49,14 +49,14 @@ end --添加事件监听(用于子类重写) function ActivityMainPanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, function() - this:OnOpen(this.activityType,_CurPageIndex) + this:OnOpen(this.activityType,_CurPageIndex,true) end) end --移除事件监听(用于子类重写) function ActivityMainPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, function() - this:OnOpen(this.activityType,_CurPageIndex) + this:OnOpen(this.activityType,_CurPageIndex,true) end) end @@ -109,18 +109,21 @@ function ActivityMainPanel:CheckActOpen(_index) end --界面打开时调用(用于子类重写) -function ActivityMainPanel:OnOpen(_activityType,_index) +function ActivityMainPanel:OnOpen(_activityType,_index,change) SoundManager.PlaySound(SoundConfig.UI_Hddakai) this.activityType = _activityType DynamicActivityManager.curActivityType = this.activityType tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType) _CurPageIndex = 0 + if change then + _index = tabs[_index].Sort + end if _index and _index > 0 then self:CheckActOpen(_index) end for index = 1, #tabs do if _CurPageIndex < 1 then - self:CheckActOpen(index) + self:CheckActOpen(tabs[index].Sort) else break end From fcd32136885d241be2861cd0fe4e4768c1d86b13 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 16 Sep 2021 15:02:14 +0800 Subject: [PATCH 05/29] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=E6=88=98=E6=96=97=E7=95=8C=E9=9D=A2=E6=88=91=E6=96=B9?= =?UTF-8?q?=E7=81=B5=E5=85=BD=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 1834ebbc0e..072996d0f0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -33946,7 +33946,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -50, y: 152} + m_AnchoredPosition: {x: -50, y: 283.5} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8374736667363694714 From 6ba0d264fde6ae71ee7fd2d2a67b46f9620bde93 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 16 Sep 2021 16:13:55 +0800 Subject: [PATCH 06/29] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=E6=88=98=E6=96=97=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E9=A2=84=E8=AE=BE=20=E6=88=91=E6=96=B9=E9=98=B5=E5=AE=B9?= =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 072996d0f0..fa222b7c46 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -103377,7 +103377,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: 1846, y: -78} + m_AnchoredPosition: {x: 1832, y: -78} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &4141209481787949115 @@ -156776,9 +156776,9 @@ RectTransform: m_Father: {fileID: -4381370023651553062} 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: -20, y: -754} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -20, y: 206} m_SizeDelta: {x: 1100, y: 202.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1048028496800183147 From 1e17301cc815bcf475a7391e9b850d3f8f5c6803 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 16:16:50 +0800 Subject: [PATCH 07/29] =?UTF-8?q?=E3=80=90=E8=83=8C=E5=8C=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=AE=9D=E7=89=A9=E8=83=8C=E5=8C=85=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E5=93=81=E8=B4=A8=E4=BC=98=E5=85=88=E7=BA=A7=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=B9=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=98=B5=E8=90=A5=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Bag/BagPanel.prefab | 1644 ++++++++++++++++- .../~Lua/Modules/Bag/BagPanel.lua | 91 +- .../Modules/RoleInfo/EquipTreasureManager.lua | 24 +- 3 files changed, 1723 insertions(+), 36 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab index ca7e403c18..1a400b361d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab @@ -194,6 +194,7 @@ RectTransform: - {fileID: 476711780267650585} - {fileID: 477330838423191453} - {fileID: 477055730160816385} + - {fileID: 4422558607796476224} - {fileID: 477069144886645859} - {fileID: 476462756984414603} - {fileID: 476880290243533489} @@ -201,6 +202,7 @@ RectTransform: - {fileID: 7658884545441271809} - {fileID: 4103700765519338555} - {fileID: 8632787153815362566} + - {fileID: 1258771451122578346} - {fileID: 396553229042369325} m_Father: {fileID: 0} m_RootOrder: 0 @@ -471,7 +473,7 @@ RectTransform: - {fileID: 8715989115649508653} - {fileID: 677243167307156643} m_Father: {fileID: 224457215098483846} - m_RootOrder: 12 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -991,11 +993,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224457215098483846} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -106.600586, y: 351.5} + m_AnchoredPosition: {x: -93, y: 351.5} m_SizeDelta: {x: 127, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &474327509007561363 @@ -2422,7 +2424,7 @@ RectTransform: m_Children: - {fileID: 476257756925467703} m_Father: {fileID: 224457215098483846} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2902,7 +2904,7 @@ RectTransform: m_Children: - {fileID: 476675878081608361} m_Father: {fileID: 224457215098483846} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3821,6 +3823,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &956339582339197595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2370100284221208931} + - component: {fileID: 1343476850571194414} + - component: {fileID: 6371040660025840758} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2370100284221208931 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956339582339197595} + 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: 5051943350440867945} + m_RootOrder: 0 + 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: 0.8, y: 0} + m_SizeDelta: {x: 164, y: 164} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1343476850571194414 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956339582339197595} + m_CullTransparentMesh: 0 +--- !u!114 &6371040660025840758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956339582339197595} + 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: 0 + 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: b1894c27fafe6d54fa31df687a95eca9, 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 &1129588892310371506 GameObject: m_ObjectHideFlags: 0 @@ -4102,6 +4178,143 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2173061109990154498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4422558607796476224} + - component: {fileID: 2046576047882514797} + - component: {fileID: 4516266431059974888} + - component: {fileID: 2676540362118525399} + - component: {fileID: 1290694098950775102} + m_Layer: 5 + m_Name: tabsBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4422558607796476224 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2173061109990154498} + 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: 224457215098483846} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -93, y: 500} + m_SizeDelta: {x: 129, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2046576047882514797 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2173061109990154498} + m_CullTransparentMesh: 0 +--- !u!114 &4516266431059974888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2173061109990154498} + 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: baf855a7c0fab394aabd85e300105444, 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!114 &2676540362118525399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2173061109990154498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4516266431059974888} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &1290694098950775102 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2173061109990154498} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &2225691749540764308 GameObject: m_ObjectHideFlags: 0 @@ -8674,7 +8887,7 @@ ParticleSystem: --- !u!199 &8784777500139318308 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -8852,6 +9065,81 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &2496445314913218414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1258771451122578346} + - component: {fileID: 2774361125621409119} + - component: {fileID: 5374927922940654508} + m_Layer: 5 + m_Name: tabs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1258771451122578346 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2496445314913218414} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2497514767653050968} + m_Father: {fileID: 224457215098483846} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -130} + m_SizeDelta: {x: 550, y: 104} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2774361125621409119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2496445314913218414} + m_CullTransparentMesh: 0 +--- !u!114 &5374927922940654508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2496445314913218414} + 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: 0 + 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: 6253e3364aa642840b7b6ca6ac30239b, 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 &2591753562080324810 GameObject: m_ObjectHideFlags: 0 @@ -9044,6 +9332,154 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u788E\u7247" LanguageIndex: 10137 +--- !u!1 &2609964549391933936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 221459964524014584} + - component: {fileID: 8256270902673806567} + - component: {fileID: 7351798449828102638} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &221459964524014584 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2609964549391933936} + 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: 5239056449752413951} + m_RootOrder: 0 + 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: 0.8, y: 0} + m_SizeDelta: {x: 164, y: 164} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8256270902673806567 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2609964549391933936} + m_CullTransparentMesh: 0 +--- !u!114 &7351798449828102638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2609964549391933936} + 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: 0 + 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: 2aa716d9a6ab8cf43b74fe84233fea55, 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 &2638423707730164036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6740957911070234502} + - component: {fileID: 1145534445814659747} + - component: {fileID: 6987625658757934205} + m_Layer: 5 + m_Name: selectBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6740957911070234502 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2638423707730164036} + 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: 5051943350440867945} + m_RootOrder: 1 + 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: 0, y: 0} + m_SizeDelta: {x: 158, y: 158} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1145534445814659747 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2638423707730164036} + m_CullTransparentMesh: 0 +--- !u!114 &6987625658757934205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2638423707730164036} + 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: 0 + 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: 8f20c7f83b837d64aa1eb6fd54fce9f1, 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 &2687213736092790001 GameObject: m_ObjectHideFlags: 0 @@ -9162,6 +9598,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2687458091738909581} m_CullTransparentMesh: 0 +--- !u!1 &2730651379039288488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6549424048576812017} + - component: {fileID: 5079181688994291918} + - component: {fileID: 1864684899050791967} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6549424048576812017 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2730651379039288488} + 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: 4929435229561581215} + m_RootOrder: 0 + 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: 0.8, y: 0} + m_SizeDelta: {x: 164, y: 164} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5079181688994291918 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2730651379039288488} + m_CullTransparentMesh: 0 +--- !u!114 &1864684899050791967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2730651379039288488} + 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: 0 + 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: 1fabd8cc4ea4bd6478e8a81d6b138900, 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 &2757116446678454878 GameObject: m_ObjectHideFlags: 0 @@ -9199,6 +9709,80 @@ RectTransform: m_AnchoredPosition: {x: 5.0000196, y: 0.29999417} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2955556607940147537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 726765576253133512} + - component: {fileID: 8032334368970286850} + - component: {fileID: 1078930398154766590} + m_Layer: 5 + m_Name: selectBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &726765576253133512 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2955556607940147537} + 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: 5239056449752413951} + m_RootOrder: 1 + 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: 0, y: 0} + m_SizeDelta: {x: 158, y: 158} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8032334368970286850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2955556607940147537} + m_CullTransparentMesh: 0 +--- !u!114 &1078930398154766590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2955556607940147537} + 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: 0 + 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: 8f20c7f83b837d64aa1eb6fd54fce9f1, 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 &2979834714666245533 GameObject: m_ObjectHideFlags: 0 @@ -13843,7 +14427,7 @@ ParticleSystem: --- !u!199 &6409678742855279415 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14214,6 +14798,154 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &3324679874753532760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 339615884170452801} + - component: {fileID: 6560071756272750443} + - component: {fileID: 6756890702281635301} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &339615884170452801 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3324679874753532760} + 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: 7377713769187783445} + m_RootOrder: 0 + 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: 0.8, y: 0} + m_SizeDelta: {x: 164, y: 164} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6560071756272750443 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3324679874753532760} + m_CullTransparentMesh: 0 +--- !u!114 &6756890702281635301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3324679874753532760} + 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: 0 + 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: 6ce1fb06fd978e5428792df8f0258903, 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 &3358204802207674077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7252503602918564191} + - component: {fileID: 268450528483332985} + - component: {fileID: 215375610004986528} + m_Layer: 5 + m_Name: selectBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7252503602918564191 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3358204802207674077} + 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: 8073395387989211245} + m_RootOrder: 1 + 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: 0, y: 0} + m_SizeDelta: {x: 158, y: 158} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &268450528483332985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3358204802207674077} + m_CullTransparentMesh: 0 +--- !u!114 &215375610004986528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3358204802207674077} + 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: 0 + 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: 8f20c7f83b837d64aa1eb6fd54fce9f1, 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 &3366922336792143973 GameObject: m_ObjectHideFlags: 0 @@ -14340,7 +15072,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224457215098483846} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -19081,7 +19813,7 @@ ParticleSystem: --- !u!199 &8594092854800795284 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23858,7 +24590,7 @@ ParticleSystem: --- !u!199 &5592400397920860441 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24665,6 +25397,125 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5996\u9B42" LanguageIndex: 10138 +--- !u!1 &4924550497456276960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8073395387989211245} + - component: {fileID: 5788509548644942059} + - component: {fileID: 2516155772159817399} + - component: {fileID: 24664644318879652} + m_Layer: 5 + m_Name: Btn2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8073395387989211245 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4924550497456276960} + 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: + - {fileID: 2403243123156036883} + - {fileID: 7252503602918564191} + m_Father: {fileID: 2497514767653050968} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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 &5788509548644942059 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4924550497456276960} + m_CullTransparentMesh: 0 +--- !u!114 &2516155772159817399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4924550497456276960} + 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: 0} + 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: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &24664644318879652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4924550497456276960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2516155772159817399} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &4960038426641913997 GameObject: m_ObjectHideFlags: 0 @@ -29309,7 +30160,7 @@ ParticleSystem: --- !u!199 &9197002972510611031 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29399,7 +30250,7 @@ RectTransform: m_Children: - {fileID: 3760438259093134196} m_Father: {fileID: 224457215098483846} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -29443,6 +30294,190 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4996542063075368937 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5051943350440867945} + - component: {fileID: 216379920496091962} + - component: {fileID: 1104811319294642809} + - component: {fileID: 1154653568986725828} + m_Layer: 5 + m_Name: Btn4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5051943350440867945 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4996542063075368937} + 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: + - {fileID: 2370100284221208931} + - {fileID: 6740957911070234502} + m_Father: {fileID: 2497514767653050968} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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 &216379920496091962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4996542063075368937} + m_CullTransparentMesh: 0 +--- !u!114 &1104811319294642809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4996542063075368937} + 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: 0} + 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: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &1154653568986725828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4996542063075368937} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1104811319294642809} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1 &5044956161681057444 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2497514767653050968} + - component: {fileID: 4564603481981465639} + m_Layer: 5 + m_Name: btnHeroGrid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2497514767653050968 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5044956161681057444} + 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: + - {fileID: 4929435229561581215} + - {fileID: 7377713769187783445} + - {fileID: 8073395387989211245} + - {fileID: 5239056449752413951} + - {fileID: 5051943350440867945} + m_Father: {fileID: 1258771451122578346} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 880, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4564603481981465639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5044956161681057444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 88, y: 88} + m_Spacing: {x: 40, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &5077371302698625173 GameObject: m_ObjectHideFlags: 0 @@ -34392,7 +35427,7 @@ ParticleSystem: --- !u!199 &567135833995928965 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35440,6 +36475,244 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5996\u9B42" LanguageIndex: 10138 +--- !u!1 &6476226762353350486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5239056449752413951} + - component: {fileID: 1000352040959216044} + - component: {fileID: 9015126431217871147} + - component: {fileID: 1958311621129782187} + m_Layer: 5 + m_Name: Btn3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5239056449752413951 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6476226762353350486} + 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: + - {fileID: 221459964524014584} + - {fileID: 726765576253133512} + m_Father: {fileID: 2497514767653050968} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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 &1000352040959216044 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6476226762353350486} + m_CullTransparentMesh: 0 +--- !u!114 &9015126431217871147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6476226762353350486} + 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: 0} + 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: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &1958311621129782187 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6476226762353350486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 9015126431217871147} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1 &6479075340216930190 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4929435229561581215} + - component: {fileID: 5968446808617466091} + - component: {fileID: 1325954721589501070} + - component: {fileID: 4308143237803170945} + m_Layer: 5 + m_Name: Btn0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4929435229561581215 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6479075340216930190} + 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: + - {fileID: 6549424048576812017} + - {fileID: 9075216863319598042} + m_Father: {fileID: 2497514767653050968} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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 &5968446808617466091 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6479075340216930190} + m_CullTransparentMesh: 0 +--- !u!114 &1325954721589501070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6479075340216930190} + 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: 0} + 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: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &4308143237803170945 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6479075340216930190} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1325954721589501070} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &6740982104692852462 GameObject: m_ObjectHideFlags: 0 @@ -35567,7 +36840,7 @@ RectTransform: m_Children: - {fileID: 568030099109615014} m_Father: {fileID: 224457215098483846} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -35647,6 +36920,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6930510671008577639 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9075216863319598042} + - component: {fileID: 398449962801287926} + - component: {fileID: 4442126470433156192} + m_Layer: 5 + m_Name: selectBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9075216863319598042 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6930510671008577639} + 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: 4929435229561581215} + m_RootOrder: 1 + 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: 0, y: 0} + m_SizeDelta: {x: 158, y: 158} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &398449962801287926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6930510671008577639} + m_CullTransparentMesh: 0 +--- !u!114 &4442126470433156192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6930510671008577639} + 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: 0 + 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: 8f20c7f83b837d64aa1eb6fd54fce9f1, 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 &7212086096276223421 GameObject: m_ObjectHideFlags: 0 @@ -35795,6 +37142,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7304656268329493759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4561462177083471301} + - component: {fileID: 3341978775743886610} + - component: {fileID: 4361975649316019575} + m_Layer: 5 + m_Name: selectBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4561462177083471301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7304656268329493759} + 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: 7377713769187783445} + m_RootOrder: 1 + 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: 0, y: 0} + m_SizeDelta: {x: 158, y: 158} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3341978775743886610 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7304656268329493759} + m_CullTransparentMesh: 0 +--- !u!114 &4361975649316019575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7304656268329493759} + 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: 0 + 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: 8f20c7f83b837d64aa1eb6fd54fce9f1, 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 &7361073845239803706 GameObject: m_ObjectHideFlags: 0 @@ -36010,7 +37431,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224457215098483846} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -36730,6 +38151,125 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8401640397365177706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7377713769187783445} + - component: {fileID: 2459446782830568002} + - component: {fileID: 808674079913614371} + - component: {fileID: 2878292491351743627} + m_Layer: 5 + m_Name: Btn1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7377713769187783445 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401640397365177706} + 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: + - {fileID: 339615884170452801} + - {fileID: 4561462177083471301} + m_Father: {fileID: 2497514767653050968} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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 &2459446782830568002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401640397365177706} + m_CullTransparentMesh: 0 +--- !u!114 &808674079913614371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401640397365177706} + 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: 0} + 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: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &2878292491351743627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401640397365177706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 808674079913614371} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &8410181294628090365 GameObject: m_ObjectHideFlags: 0 @@ -36805,6 +38345,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8665295123735778928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2403243123156036883} + - component: {fileID: 5381295063284530666} + - component: {fileID: 3985466650017132034} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2403243123156036883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665295123735778928} + 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: 8073395387989211245} + m_RootOrder: 0 + 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: 0.8, y: 0} + m_SizeDelta: {x: 164, y: 164} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5381295063284530666 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665295123735778928} + m_CullTransparentMesh: 0 +--- !u!114 &3985466650017132034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665295123735778928} + 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: 0 + 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: b720e002b50145541bcfc7ec60f2aadd, 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 &8689323819376984089 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 26097a754b..81e5de1f2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -12,6 +12,12 @@ local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig) local isFristOpenTime = Timer.New() local orginLayer=0--层级 local list={} + +local ImgList = { + [ItemBaseType.Equip] = "r_chushou_zh", + [ItemBaseType.SoulPrint] = "r_fenjie_zh", + [ItemBaseType.EquipTreasure] = "r_fenjie_zh", +} --初始化组件(用于子类重写) function BagPanel:InitComponent() this.spLoader = SpriteLoader.New() @@ -29,6 +35,7 @@ function BagPanel:InitComponent() this.selectBtn1:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_xuanze_001") this.BtView = SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform) this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform) + this.Ta = Util.GetGameObject(self.gameObject, "fenJieBtn") this.fenJieBtn = Util.GetGameObject(self.gameObject, "fenJieBtn") this.itemNumText = Util.GetGameObject(self.gameObject, "itemNumText") this.ItemView = Util.GetGameObject(self.gameObject, "ItemView") @@ -39,7 +46,18 @@ function BagPanel:InitComponent() this.isBagPanel = true this.EffectOrginLayer = 0 this.mask = Util.GetGameObject(self.gameObject, "mask") - + this.tabsBtn = Util.GetGameObject(self.gameObject, "tabsBtn") + this.tabs = Util.GetGameObject(self.gameObject, "tabs") + this.tabs.transform.anchoredPosition = Vector2.New(0,-130) + this.tabs:SetActive(false) + this.tabsList = {} + this.selectImg = {} + for i = 1, 5 do + this.tabsList[i] = Util.GetGameObject(this.tabs, "btnHeroGrid/Btn"..i-1) + this.selectImg[i] = Util.GetGameObject(this.tabsList[i], "selectBtn") + this.selectImg[i]:SetActive(false) + end + this.selectImg[1]:SetActive(true) --无信息图片 this.noneImage=Util.GetGameObject(self.gameObject,"NoneImage") end @@ -54,6 +72,16 @@ function BagPanel:BindEvent() end) for i = 1, 7 do Util.AddClick(tabs1[i], function() + --设置tabs的琐碎----- + this.tabs.transform.anchoredPosition = Vector2.New(0,-130) + this.tabs:SetActive(false) + this.isShowTabs = false + for j = 1, 5 do + this.selectImg[j]:SetActive(false) + end + this.selectImg[1]:SetActive(true) + --====================== + if this.isFristOpen == false then if i == sortIndex then return @@ -79,18 +107,55 @@ function BagPanel:BindEvent() else UIManager.OpenPanel(UIName.HeroAndEquipResolvePanel, 4)--魂印 end + elseif sortIndex == ItemBaseType.EquipTreasure then--法宝 + local temp = EquipTreasureManager.GetAllTreasures() + if not temp or #temp < 1 then + PopupTipPanel.ShowTip("无可分解宝物") + else + UIManager.OpenPanel(UIName.ResolvePanel, 2) + end end end) + Util.AddClick(this.tabsBtn, function() + this:MoveTabs() + end) + for i = 1, 5 do + Util.AddOnceClick(this.tabsList[i],function () + for j = 1, 5 do + this.selectImg[j]:SetActive(false) + end + this.selectImg[i]:SetActive(true) + this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true,i-1) + end) + end BindRedPointObject(RedPointType.Bag_HeroDebris, tabs1RedPoint[ItemBaseType.HeroChip]) BindRedPointObject(RedPointType.Bag_BoxAndBlueprint, tabs1RedPoint[ItemBaseType.Special]) end +function this:MoveTabs() + this.tabsBtn:GetComponent("Button").enabled = false + this.isShowTabs = not this.isShowTabs + if this.isShowTabs then + this.tabs:SetActive(true) + this.tabs.transform:DOAnchorPosY(370, 0.5, false):OnComplete(function() + this.tabsBtn:GetComponent("Button").enabled = true + end) + else + this.tabs.transform:DOAnchorPosY(-130, 0.5, false):OnComplete(function() + this.tabsBtn:GetComponent("Button").enabled = true + this.tabs:SetActive(false) + end) + end +end + function this.JumpOnClickTabBtn(_sortIndex) sortIndex = _sortIndex this.OnClickTabBtn(sortIndex, tabs1[sortIndex], true) end + + function this:SetSelectBtn(_btn) if _btn then this.selectBtn1:SetActive(true) @@ -100,8 +165,9 @@ function this:SetSelectBtn(_btn) else this.selectBtn1:SetActive(false) end - this.fenJieBtn:SetActive(sortIndex == ItemBaseType.SoulPrint or sortIndex == ItemBaseType.Equip)--装备 - this.fenJieBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(sortIndex == ItemBaseType.SoulPrint and "r_fenjie_zh" or "r_chushou_zh" )--装备 + this.tabsBtn:SetActive(sortIndex == ItemBaseType.EquipTreasure) + this.fenJieBtn:SetActive(sortIndex == ItemBaseType.SoulPrint or sortIndex == ItemBaseType.Equip or sortIndex == ItemBaseType.EquipTreasure)--装备 + this.fenJieBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(tostring(ImgList[sortIndex]))--装备 this.itemNumText:SetActive(sortIndex == ItemBaseType.Equip or sortIndex == ItemBaseType.SoulPrint or sortIndex == ItemBaseType.EquipTreasure)--装备 法宝 end @@ -129,7 +195,7 @@ function this.BagGoldChangeCallBackOnClickTabBtn() this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true) end -function this.OnClickTabBtn(_index, _clickBtn, isTop,isNotAni) +function this.OnClickTabBtn(_index, _clickBtn, isTop,isNotAni,_tabIndex) sortIndexBtnGo = _clickBtn itemData = {} local itemNumText = this.itemNumText:GetComponent("Text") @@ -152,14 +218,13 @@ function this.OnClickTabBtn(_index, _clickBtn, isTop,isNotAni) itemNumText.text = Language[10173]..#itemData.."/"..specialConfig[9].Value this:SetItemData(itemData, isTop,isNotAni) elseif (_index == ItemBaseType.EquipTreasure) then - itemData = EquipTreasureManager.GetAllTreasures() + itemData = EquipTreasureManager.GetAllTreasures(_tabIndex) itemNumText.text = Language[10174]..LengthOfTable(itemData).."/"..specialConfig[10].Value this:SetItemData(itemData, isTop,isNotAni) elseif (_index == ItemBaseType.Special) then itemData = BagManager.GetBagItemDataByItemTypeV2(ItemBaseType.Special,ItemBaseType.Materials,ItemType.HeadFrame) this:SetItemData(itemData, isTop,isNotAni) else - itemData = BagManager.GetBagItemDataByItemType(_index) this:SetItemData(itemData, isTop,isNotAni) end @@ -509,6 +574,17 @@ function BagPanel:OnShow() this.sortingOrder = self.sortingOrder this.isFristOpen = true this.mask:SetActive(true) + + --设置tabs的琐碎----- + this.isShowTabs = false + this.tabs.transform.anchoredPosition = Vector2.New(0,-130) + this.tabs:SetActive(false) + for j = 1, 5 do + this.selectImg[j]:SetActive(false) + end + this.selectImg[1]:SetActive(true) + --====================== + if this.ScrollView then this.ScrollView:SetIndex(1) end @@ -763,7 +839,8 @@ function BagPanel:OnDestroy() list={} orginLayer2=0 orginLayer=0 - + this.tabsList = {} + this.selectImg = {} if this.playerInfoView then SubUIManager.Close(this.playerInfoView) this.playerInfoView = nil diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index 9038835c44..9ff76e992b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -412,13 +412,12 @@ function this.GetAllTreasuresByLocation(Location, PropertyName) end --获取所有宝物 不算英雄身上穿的 function this.GetAllTreasures(PropertyName) - if PropertyName then - end + local curAllEquipTreasure = {} for key, value in pairs(allTreasures) do if value.upHeroDid == "" or value.upHeroDid == "0" then if PropertyName then - if jewelConfig[value.id].Race == PropertyName then + if jewelConfig[value.id].Race == PropertyName or PropertyName == 0 then table.insert(curAllEquipTreasure, value) end else @@ -427,20 +426,17 @@ function this.GetAllTreasures(PropertyName) end end if LengthOfTable(curAllEquipTreasure) > 0 then - table.sort( - curAllEquipTreasure, - function(a, b) - if a.quantity == b.quantity then - if a.lv == b.lv then - return a.refineLv > b.refineLv - else - return a.lv > b.lv - end + table.sort(curAllEquipTreasure,function(a, b) + if a.quantity == b.quantity then + if a.lv == b.lv then + return a.refineLv > b.refineLv else - return a.quantity > b.quantity + return a.lv > b.lv end + else + return a.quantity > b.quantity end - ) + end) return curAllEquipTreasure end From 9a5a18268ed81f578463407b4190ec12685a7f8d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 16 Sep 2021 16:28:43 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=E6=88=98=E6=96=97=E7=95=8C=E9=9D=A2=E9=A2=84?= =?UTF-8?q?=E8=AE=BE=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index fa222b7c46..09bdf30190 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -33946,7 +33946,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -50, y: 283.5} + m_AnchoredPosition: {x: -50, y: 199.6} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8374736667363694714 From 90a9abba0dac8a2068ecb6555afe73b7444b3472 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 16:41:23 +0800 Subject: [PATCH 09/29] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E8=BF=B7?= =?UTF-8?q?=E8=B8=AA=E3=80=91=E6=8F=90=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/DynamicActivity/DynamicActivityManager.lua | 2 ++ .../ManagedResources/~Lua/Modules/Player/JumpManager.lua | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 3921f63529..44ceb3a80b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -797,8 +797,10 @@ function this.XunBaoMiZongRedCheck() local configData = ConfigManager.GetConfigDataByKey(ConfigName.LotterySetting,"ActivityId",actData.activityId) local itemNum = configData.CostItem[1] if BagManager.GetTotalItemNum(itemNum[1]) >= itemNum[2] then + LogRed("寻宝迷踪红点检测true") return true else + LogRed("寻宝迷踪红点检测false") return false end end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 693a8de52a..e835154dd5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -696,7 +696,13 @@ local jumpDic = { this.JumpActivity(JumpType.XingChenShangDian,data[1]) end, [JumpType.XunBaoMiZongShangDian] = function (data) --寻宝迷踪 - this.JumpActivity(JumpType.XunBaoMiZongShangDian,data[1]) + local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XunBaoMiZong) + if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(ActivityTypeDef.XunBaoMiZong) then + this.JumpActivity(JumpType.XunBaoMiZongShangDian,data[1]) + else + PopupTipPanel.ShowTip("活动尚未开启") + this.isOpen = false + end end, [JumpType.FightLevel] = function (data) UIManager.OpenPanel(UIName.FightLevelChapterPanel) From 20c122e096b09453a2e01321b7a36cba07228118 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 16:52:22 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E8=BF=B7?= =?UTF-8?q?=E8=B8=AA=E3=80=91=E7=BA=A2=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/DynamicActivityManager.lua | 2 -- Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 44ceb3a80b..3921f63529 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -797,10 +797,8 @@ function this.XunBaoMiZongRedCheck() local configData = ConfigManager.GetConfigDataByKey(ConfigName.LotterySetting,"ActivityId",actData.activityId) local itemNum = configData.CostItem[1] if BagManager.GetTotalItemNum(itemNum[1]) >= itemNum[2] then - LogRed("寻宝迷踪红点检测true") return true else - LogRed("寻宝迷踪红点检测false") return false end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index e30bda9319..75c3a4a6aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -599,7 +599,7 @@ function RewardItemPopup:RedCheckFuns() -- 检测月卡激活是否需要拍脸 OperatingManager.CheckMonthCardPatFace() --寻宝迷踪红点检测 - DynamicActivityManager.XunBaoMiZongRedCheck() + CheckRedPointStatus(RedPointType.XunBaoMiZong) end --界面销毁时调用(用于子类重写) From b83bf2dff494e22ac713692d2906e10c0acb3319 Mon Sep 17 00:00:00 2001 From: skuld Date: Thu, 16 Sep 2021 16:53:50 +0800 Subject: [PATCH 11/29] =?UTF-8?q?bat=E9=8E=B5=E7=91=B0=EE=98=A9=E9=90=9E?= =?UTF-8?q?=E5=97=9A=E5=9A=9C=E9=8D=94=E3=84=A6=E5=B8=B9=E9=96=AB=3F2021/0?= =?UTF-8?q?9/16,16:53:49?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/j_jianmushenshu_anniu_01_zh.png | Bin 28045 -> 26275 bytes .../j_jianmushenshu_anniu_01_zh.png.meta | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Atlas/SacredTreeAtlas/ArtFont/j_jianmushenshu_anniu_01_zh.png b/Assets/ManagedResources/Atlas/SacredTreeAtlas/ArtFont/j_jianmushenshu_anniu_01_zh.png index 93dfaadcd2b5dc88e615af96a3a08069f45a126b..481ba598c26456b1fd56910a7500b1ee6c7895f2 100644 GIT binary patch literal 26275 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 diff --git a/Assets/ManagedResources/Atlas/SacredTreeAtlas/ArtFont/j_jianmushenshu_anniu_01_zh.png.meta b/Assets/ManagedResources/Atlas/SacredTreeAtlas/ArtFont/j_jianmushenshu_anniu_01_zh.png.meta index 8228e6dd16..fbfc14f5f6 100644 --- a/Assets/ManagedResources/Atlas/SacredTreeAtlas/ArtFont/j_jianmushenshu_anniu_01_zh.png.meta +++ b/Assets/ManagedResources/Atlas/SacredTreeAtlas/ArtFont/j_jianmushenshu_anniu_01_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0e2ff0e5cbd6384ea4afd24a076c9f8 +guid: 488d0d172a41d7d428ea8716d1d47d2f TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 6e9b8c9a138effa40b0c88b7b6d20c59 + spriteID: 635c2966e00c6284fa45c30d5fd307b6 vertices: [] indices: edges: [] From 52ca68fe7e064a1cf7ac7b9cd5f05599b2e71cb2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 16 Sep 2021 16:57:13 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 一键提交到git.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/一键提交到git.bat b/一键提交到git.bat index 64ee5102d2..e6becc2904 100644 --- a/一键提交到git.bat +++ b/一键提交到git.bat @@ -8,7 +8,7 @@ for %%i in (%words%) do ( git add %%i* ) - git commit -m "bat批处理自动推送:%date:~0,10%,%time:~0,8%" + git commit -m "bat Resource Commit:%date:~0,10%,%time:~0,8%" :: git commit -m "%commitMessage%" git push origin master @echo 已经完成, From 58611fc517177bac3c62d6ab3263668bb768d9a2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 16 Sep 2021 17:03:02 +0800 Subject: [PATCH 13/29] bat Resource Commit:2021/09/16,17:03:02 --- .../ArtFont/j_jianmushenshu_anniu_01_zh.png.meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Atlas/SacredTreeAtlas/ArtFont/j_jianmushenshu_anniu_01_zh.png.meta b/Assets/ManagedResources/Atlas/SacredTreeAtlas/ArtFont/j_jianmushenshu_anniu_01_zh.png.meta index fbfc14f5f6..577648ad78 100644 --- a/Assets/ManagedResources/Atlas/SacredTreeAtlas/ArtFont/j_jianmushenshu_anniu_01_zh.png.meta +++ b/Assets/ManagedResources/Atlas/SacredTreeAtlas/ArtFont/j_jianmushenshu_anniu_01_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 488d0d172a41d7d428ea8716d1d47d2f +guid: 09638e59d09cf1c43954634b88de2bd2 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 635c2966e00c6284fa45c30d5fd307b6 + spriteID: ffa0374ee4b1ae840b1a1917f9ea49a8 vertices: [] indices: edges: [] From 1809ae78906d11fb154c7bb768e3ffd37859b2dd Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 17:05:27 +0800 Subject: [PATCH 14/29] =?UTF-8?q?=E3=80=90=E9=AD=82=E7=81=B5=E5=AE=9D?= =?UTF-8?q?=E3=80=91=E5=9B=9E=E6=94=B6=E7=95=8C=E9=9D=A2=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua index 9ee3fb2eb9..7d72d83300 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua @@ -110,6 +110,13 @@ function this.SortDatas(tarEquipTreasure) end end ) + table.sort(tarEquipTreasure, function(a, b) + if a.itemConfig.Sort == b.itemConfig.Sort then + return a.itemConfig.Id > b.itemConfig.Id + else + return a.itemConfig.Sort < b.itemConfig.Sort + end + end) return tarEquipTreasure end --英雄单个数据展示 From 8293c56b37ae9b601836c17227aad43216da64ee Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 16 Sep 2021 17:10:39 +0800 Subject: [PATCH 15/29] =?UTF-8?q?=E5=BB=BA=E6=9C=A8=E7=A5=9E=E6=A0=91?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f127a0e8586481ffeb4d8d5feb33f9371b43f79f) --- Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua | 1 + Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 16f9dc686e..2d197ee738 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -60,6 +60,7 @@ function Practice:InitComponent() self.mask = Util.GetGameObject(self.gameObject, "mask") self.treeBtn = Util.GetGameObject(self.gameObject, "Btns/treeBtn") + Util.GetGameObject(self.treeBtn,"treebtn"):GetComponent("Image").sprite = this.spLoader:LoadSprite("j_jianmushenshu_anniu_01_zh") self.treeRed = Util.GetGameObject(self.treeBtn, "redPoint") end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 42f462d7a8..dcdaf0b62b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -150,6 +150,7 @@ function RoleEquipPanel:InitComponent() end this.treeBtn = Util.GetGameObject(self.gameObject, "treeBtn") + Util.GetGameObject(this.treeBtn,"treebtn"):GetComponent("Image").sprite = this.spLoader:LoadSprite("j_jianmushenshu_anniu_01_zh") Util.AddClick(this.treeBtn, function() if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE) then UIManager.OpenPanel(UIName.SacredTreePanel) From 6c5552524b130663ed00f65112fb0ce552f92880 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 16 Sep 2021 17:15:30 +0800 Subject: [PATCH 16/29] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 80e81f9f9bc66a6f524186501da9dbdf5939e2cc) --- Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 2d197ee738..f52bb9cd69 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -60,7 +60,7 @@ function Practice:InitComponent() self.mask = Util.GetGameObject(self.gameObject, "mask") self.treeBtn = Util.GetGameObject(self.gameObject, "Btns/treeBtn") - Util.GetGameObject(self.treeBtn,"treebtn"):GetComponent("Image").sprite = this.spLoader:LoadSprite("j_jianmushenshu_anniu_01_zh") + Util.GetGameObject(self.treeBtn,"treebtn"):GetComponent("Image").sprite = self.spLoader:LoadSprite("j_jianmushenshu_anniu_01_zh") self.treeRed = Util.GetGameObject(self.treeBtn, "redPoint") end From 3b42d8034d71f34f8d0b5c8313b11952bae205bc Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 16 Sep 2021 17:27:16 +0800 Subject: [PATCH 17/29] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=E6=8A=80=E8=83=BD=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E9=87=8C=20=E6=8A=80=E8=83=BD=E6=98=AF=E5=90=A6=E8=83=BD?= =?UTF-8?q?=E9=87=8A=E6=94=BE=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD=20=20?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E6=94=BB=E5=87=BB=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=B0=B1=E8=BF=94=E5=9B=9E=20false?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Role/Skill.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua index dde4102dea..25ab3b6ca8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua @@ -52,6 +52,15 @@ function Skill:GetOwner() end -- 是否可以释放 function Skill:canCastSkill() + if self.effectCaster then + --放技能前判断是否有目标,没有就不会放技能,直接执行技能回调 by 王振兴 2021/03/26 + --为解决攻击目标只剩被放逐的单位导致技能播放异常 + self.effectCaster:ChooseTarget() + local targets=BattleUtil.LengthOfTable(self:GetDirectTargetsNoExile()) + if targets==0 then + return false + end + end return true end From da21b0ba37735ffd517bb699d7779208fdddf593 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 16 Sep 2021 17:29:16 +0800 Subject: [PATCH 18/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua index 8b60a5e982..f74570fdef 100644 --- a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua @@ -48,6 +48,7 @@ function XunBaoMiZongMap:BindEvent() self.effect:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(self.rewardPos.x, self.rewardPos.y, 10) self.effect:SetActive(true) self.btnGet.gameObject:GetComponent("Button").interactable = false + self.btnBack.gameObject:GetComponent("Button").interactable = true cantWalk = true SoundManager.PlaySound("UI_021") Timer.New(function () @@ -86,6 +87,8 @@ function XunBaoMiZongMap:OnShow() end cantWalk = true self.btnGet.gameObject:GetComponent("Button").interactable = true + self.btnBack.gameObject:GetComponent("Button").interactable = true + self.btnGet.sprite = self.spLoader:LoadSprite("x_xbmz_xunbaoanniu01") self.liveNode = PlayerLiveView:New(self.roleRoot,1) self.liveNode:OnOpen(300,Vector3.zero,WALK_DIR.IDLE_FRONT) self.liveNode:SetTitleHide() From 9d8fa02bccc7633fd3565feff4e9478aa509208b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 17:33:23 +0800 Subject: [PATCH 19/29] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E8=BF=B7?= =?UTF-8?q?=E8=B8=AA=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua index f74570fdef..46c9c5c480 100644 --- a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua @@ -48,7 +48,7 @@ function XunBaoMiZongMap:BindEvent() self.effect:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(self.rewardPos.x, self.rewardPos.y, 10) self.effect:SetActive(true) self.btnGet.gameObject:GetComponent("Button").interactable = false - self.btnBack.gameObject:GetComponent("Button").interactable = true + self.btnBack.gameObject:GetComponent("Button").interactable = false cantWalk = true SoundManager.PlaySound("UI_021") Timer.New(function () From 6c17058b8e13be0a391fe7117b59abcc339979a7 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 17:45:14 +0800 Subject: [PATCH 20/29] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E8=BF=B7?= =?UTF-8?q?=E8=B8=AA=E3=80=91=E6=B4=BB=E5=8A=A8=E7=BB=93=E6=9D=9F=E8=B7=B3?= =?UTF-8?q?=E5=9B=9E=E8=BF=98=E5=BC=B9=E5=87=BA=E5=A5=96=E5=8A=B1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/GeneralBigPopup_XunBaoMiZong.lua | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XunBaoMiZong.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XunBaoMiZong.lua index e72cb4ebfc..844596a8d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XunBaoMiZong.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XunBaoMiZong.lua @@ -40,10 +40,16 @@ function this:OnShow(_parent,...) end function this:Refresh(isTop,isAni) - local dataList = self.actData.FreelyData - self.scrollView:SetData(dataList, function (index, item) - this:ShowSingleItem(item, dataList[index],index) - end,not isTop,not isAni) + local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XunBaoMiZong) + if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(ActivityTypeDef.XunBaoMiZong) then + local dataList = self.actData.FreelyData + self.scrollView:SetData(dataList, function (index, item) + this:ShowSingleItem(item, dataList[index],index) + end,not isTop,not isAni) + else + self.parent:ClosePanel() + PopupTipPanel.ShowTip("活动尚未开启") + end end function this:ShowSingleItem(go,data,index) From 5e07162f810295c4419c1532b0b16f97dff7fcb4 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 16 Sep 2021 17:54:25 +0800 Subject: [PATCH 21/29] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=E7=87=83?= =?UTF-8?q?=E7=83=A7=E7=89=B9=E6=95=88=E9=A2=84=E8=AE=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Effect/Buff/fx_ranshao_zong.prefab | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/Effect/Buff/fx_ranshao_zong.prefab b/Assets/ManagedResources/Prefabs/Effect/Buff/fx_ranshao_zong.prefab index 8e709c4ba2..45d5007a5c 100644 --- a/Assets/ManagedResources/Prefabs/Effect/Buff/fx_ranshao_zong.prefab +++ b/Assets/ManagedResources/Prefabs/Effect/Buff/fx_ranshao_zong.prefab @@ -32,7 +32,7 @@ Transform: - {fileID: 5926213016013014797} - {fileID: 5926213015242681153} - {fileID: 5926213015375206785} - m_Father: {fileID: 5926213016179661416} + m_Father: {fileID: 3474622946622544990} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &5926213014297028206 @@ -18857,7 +18857,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5926213016179661416} + - component: {fileID: 3474622946622544990} - component: {fileID: 5926213016179661462} - component: {fileID: 5926213016179661463} m_Layer: 5 @@ -18867,8 +18867,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5926213016179661416 -Transform: +--- !u!224 &3474622946622544990 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -18881,7 +18881,12 @@ Transform: - {fileID: 5926213014297028192} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!198 &5926213016179661462 ParticleSystem: m_ObjectHideFlags: 0 From 7e97b7c90bd617a1ee2d738d21361765a723b76a Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 18:11:33 +0800 Subject: [PATCH 22/29] =?UTF-8?q?=E3=80=90=E9=80=9A=E7=94=A8=E5=A4=A7?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E3=80=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/GeneralPanel/GeneralBigPopup.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua index 5b1ef4a326..fa38d9ca59 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua @@ -92,12 +92,13 @@ function GeneralBigPopup:OnOpen(popupKey,...) end this.Mask:SetActive(popupKey ~= GENERAL_POPUP_TYPE.Onhook) this.BG:SetActive(popupKey ~= GENERAL_POPUP_TYPE.Onhook) - - contentPrefabs[popupKey].gameObject:SetActive(true) - contentScripts[popupKey].view:OnShow(this,...)--1、传入自己 2、传入不定参 + this.popupKey = popupKey + this.args = ... end function GeneralBigPopup:OnShow() + contentPrefabs[this.popupKey].gameObject:SetActive(true) + contentScripts[this.popupKey].view:OnShow(this,this.args)--1、传入自己 2、传入不定参 end function GeneralBigPopup:OnClose() From e584db1eaafced2bb12f03dec813db8f987198c7 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 16 Sep 2021 20:31:12 +0800 Subject: [PATCH 23/29] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8196=20200=20188=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 7b544e6826..cb166211fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -3961,8 +3961,8 @@ local passivityList = { table.insert(cl, {v, ct}) end end - role.Event:DispatchEvent(BattleEventName.PassiveDamageShare, _CallBack,skill) - atkRole.Event:DispatchEvent(BattleEventName.PassiveDamageBeShare, _CallBack,skill) + role.Event:DispatchEvent(BattleEventName.PassiveDamageShare, _CallBack,skill,atkRole) + atkRole.Event:DispatchEvent(BattleEventName.PassiveDamageBeShare, _CallBack,skill,role) ff = BattleUtil.CountChangeList(ff, cl) -- 计算分摊伤害 @@ -4108,7 +4108,6 @@ local passivityList = { if maxNum and maxNum > 0 then cf = cf/maxNum end - local targets = skill:GetDirectTargets() if not targets or #targets == 0 then return end @@ -4169,15 +4168,18 @@ local passivityList = { end) end, - -- 对敌方造成伤害如被分摊其分摊比降低[a]% - -- a[float] + -- 对敌方造成伤害如被分摊其分摊比降低[a]%,判断类型[b](b:1 技能 2 普攻 3 所有 4:燃烧目标 ) + -- a[float],b[int] [196] = function(role, args,id,judge) local f1 = args[1] local type = args[2] - local onDamageBeShare = function(func,skill) + local onDamageBeShare = function(func,skill,target) if skill and not skill.isTriggerJudge and judge==1 then return - end + end + if type==4 and not BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function (buff) return buff.type== BuffName.DOT and buff.damageType==1 end,role,1) then + return + end --普攻不会被降低分摊 2020/11/17 wangzhenxing lihaiyang if type==1 and skill and skill.type~=BattleSkillType.Normal then return @@ -4288,8 +4290,8 @@ local passivityList = { table.insert(cl, {v, ct}) end end - role.Event:DispatchEvent(BattleEventName.PassiveDamageShare, _CallBack,skill) - atkRole.Event:DispatchEvent(BattleEventName.PassiveDamageBeShare, _CallBack,skill) + role.Event:DispatchEvent(BattleEventName.PassiveDamageShare, _CallBack,skill,atkRole) + atkRole.Event:DispatchEvent(BattleEventName.PassiveDamageBeShare, _CallBack,skill,defRole) ff = BattleUtil.CountChangeList(ff, cl) local shareDamage = floor(BattleUtil.ErrorCorrection(damage * f1*ff)) -- 被攻击武将自身伤害 From 38fcf555ddaea54f7e8519cfb6a151c50d75cb64 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 16 Sep 2021 22:43:38 +0800 Subject: [PATCH 24/29] =?UTF-8?q?=E3=80=90=E5=B1=B1=E6=B2=B3=E7=A4=BE?= =?UTF-8?q?=E7=A8=B7=E5=9B=BE=E3=80=91=E4=BF=AE=E5=A4=8D=E6=88=98=E6=96=97?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/BattlePanel.lua | 2 +- .../~Lua/Modules/FightLevel/FightLevelManager.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index ed6fc43ada..db0b820057 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -461,7 +461,7 @@ function this.BattleEnd(result) -- 判断是否需要进行结果检测 if this.fightResult then if result ~= this.fightResult then - BattleRecordManager.SubmitCheckFight(this.fightResult, result) + BattleRecordManager.SubmitCheckFight(result, this.fightResult) end end -- 直接显示结果 diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua index 71d0c5b252..193ff8320a 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua @@ -163,13 +163,13 @@ function this.FightLevelFightBattle(_fightLevelData, callBack) -- Log("山河社稷图回复战斗 星级 "..msg.stars.." drop "..#msg.drop.itemlist) HardStageFightResponseMsg = msg curBattlefightLevelData = _fightLevelData - local result = msg.stars > 0 and 1 or 0 + -- local result = msg.stars > 0 and 1 or 0 if _fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then local fightData = BattleManager.GetBattleServerData(msg,0) - UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.FIGHTLEVEL, callBack):SetResult(result) + UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.FIGHTLEVEL, callBack)--:SetResult(result) elseif _fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.AssistantLevel then local fightData = BattleManager.GetBattleServerData(msg,0) - UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.FIGHT_ASSISTANT_LEVEL, callBack):SetResult(result) + UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.FIGHT_ASSISTANT_LEVEL, callBack)--:SetResult(result) elseif _fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.AssistantLevelReward then UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() --刷新数据刷新界面 From 4511eec3835ea246c195a2af1a79c6ae1882c221 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 17 Sep 2021 11:55:18 +0800 Subject: [PATCH 25/29] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8196=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index cb166211fc..85cb17778c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -4168,7 +4168,7 @@ local passivityList = { end) end, - -- 对敌方造成伤害如被分摊其分摊比降低[a]%,判断类型[b](b:1 技能 2 普攻 3 所有 4:燃烧目标 ) + -- 对敌方造成伤害如被分摊其分摊比降低[a]%,判断类型[b](b:1 普攻 2 技能 3 所有 4:燃烧目标 技能 ) -- a[float],b[int] [196] = function(role, args,id,judge) local f1 = args[1] @@ -4177,7 +4177,8 @@ local passivityList = { if skill and not skill.isTriggerJudge and judge==1 then return end - if type==4 and not BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function (buff) return buff.type== BuffName.DOT and buff.damageType==1 end,role,1) then + if type==4 and not BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function (buff) return buff.type== BuffName.DOT and buff.damageType==1 end,role,1) and + skill and skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra and skill.type~=BattleSkillType.DeadSkill then return end --普攻不会被降低分摊 2020/11/17 wangzhenxing lihaiyang From 80c4f8cd236c7aa0b270db56b6c7867efe640dc8 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 17 Sep 2021 13:34:15 +0800 Subject: [PATCH 26/29] =?UTF-8?q?=E3=80=90ID1018487=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E9=B8=BF=E8=92=99=E9=98=B5=E3=80=91=E5=85=B1=E9=B8=A3=E7=9A=84?= =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=92=8C=E5=AE=9D=E7=89=A9=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=85=B1=E9=B8=A3=E7=9A=84=E7=AE=AD=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleEquipPanel.prefab | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 2bca11d6d5..44164f8b8b 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -4799,8 +4799,8 @@ RectTransform: m_Children: - {fileID: 1038286848797717324} - {fileID: 8773250241928916216} - - {fileID: 7192500783854778062} - {fileID: 9213494320095827108} + - {fileID: 7192500783854778062} - {fileID: 726478980537134316} - {fileID: 6787750521099172436} - {fileID: 4326763871812024314} @@ -5346,8 +5346,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8773970828275836580} - - {fileID: 7802777161117319042} - {fileID: 8717039602528262249} + - {fileID: 7802777161117319042} - {fileID: 1473804682652306613} - {fileID: 6434840553229058696} m_Father: {fileID: 224353427390833726} @@ -6452,8 +6452,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8773887651407534236} - - {fileID: 5134932089081327844} - {fileID: 3664213903146751088} + - {fileID: 5134932089081327844} - {fileID: 841610737445374472} - {fileID: 8440128951764089854} m_Father: {fileID: 224353427390833726} @@ -6533,8 +6533,8 @@ RectTransform: m_Children: - {fileID: 4916783252602824613} - {fileID: 8773545490129017070} - - {fileID: 4359432188486531703} - {fileID: 7370870530407204259} + - {fileID: 4359432188486531703} - {fileID: 5075066562634089231} - {fileID: 4772160518092357000} - {fileID: 767536665978574478} @@ -6700,8 +6700,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224158546098438708} - - {fileID: 2042786427835682893} - {fileID: 8519913330498722392} + - {fileID: 2042786427835682893} - {fileID: 5958971747525970482} - {fileID: 7225922217035970132} m_Father: {fileID: 224353427390833726} @@ -12277,8 +12277,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8773833043905852742} - - {fileID: 4534655569651322158} - {fileID: 3071424370041062767} + - {fileID: 4534655569651322158} - {fileID: 3999081153343366784} - {fileID: 1901042942284068930} m_Father: {fileID: 224353427390833726} @@ -18034,7 +18034,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224950323983480262} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -42497,7 +42497,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224292030102175808} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -47545,7 +47545,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224737750581944100} - m_RootOrder: 2 + 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} @@ -72351,7 +72351,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224252541779665038} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -72424,7 +72424,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224346343574370934} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -77543,7 +77543,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224346343574370934} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -77735,7 +77735,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224252541779665038} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -126122,7 +126122,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224737750581944100} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -150264,7 +150264,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224292030102175808} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -164762,7 +164762,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224461338842806296} - m_RootOrder: 2 + 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} @@ -174443,7 +174443,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224461338842806296} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -184467,7 +184467,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224950323983480262} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} From 52221aca04765afbffc4412541b5209d8e1ae1c9 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 17 Sep 2021 14:26:30 +0800 Subject: [PATCH 27/29] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8196=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 85cb17778c..37e6aa9276 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -4177,8 +4177,8 @@ local passivityList = { if skill and not skill.isTriggerJudge and judge==1 then return end - if type==4 and not BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function (buff) return buff.type== BuffName.DOT and buff.damageType==1 end,role,1) and - skill and skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra and skill.type~=BattleSkillType.DeadSkill then + if type==4 and (not BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function (buff) return buff.type== BuffName.DOT and buff.damageType==1 end,role,1) + or (skill and (skill.type==BattleSkillType.Normal or skill.type==BattleSkillType.ChaosNormal))) then return end --普攻不会被降低分摊 2020/11/17 wangzhenxing lihaiyang From 32ba399115401415a8bd4251ad67f1634f209935 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 17 Sep 2021 14:47:20 +0800 Subject: [PATCH 28/29] =?UTF-8?q?=E3=80=90ID1018484=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83=E3=80=91=E6=8A=BD=E5=88=B0?= =?UTF-8?q?=E6=95=B4=E5=8F=AA=E7=81=B5=E5=85=BD=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=87=8D=E7=99=BB=E6=89=8D=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=9C=A8?= =?UTF-8?q?=E8=83=8C=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua index aa4ebb4962..0ea106770b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua @@ -62,6 +62,7 @@ function this.Show() --转起来 resultId = msg.resultId LogYellow("掉落的Id:"..resultId) + BagManager.GoIntoBackData(msg.drop) this.test() --4秒后显示掉落 -- Timer.New(function() From df1409717d266f785ffea77768f7fec48b6de136 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 17 Sep 2021 15:20:44 +0800 Subject: [PATCH 29/29] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5=E9=87=8A=E6=94=BE=E5=A4=84?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E7=9B=AE=E6=A0=87=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=88=99=E4=B8=8D=E8=83=BD=E9=87=8A=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Role/RoleLogic.lua | 9 +++++++++ .../~Lua/Modules/Battle/Logic/Role/Skill.lua | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index dc0828b95f..86e37bd94f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -327,6 +327,15 @@ end -- 判断角色是否可以释放技能 function RoleLogic:IsAvailable(skill) + if skill and skill.effectCaster then + --放技能前判断是否有目标,没有就不会放技能,直接执行技能回调 by 王振兴 2021/09/17 + --为解决攻击目标只剩被放逐的单位导致我方不放技能扣除怒气 + skill.effectCaster:ChooseTarget() + local targets=BattleUtil.LengthOfTable(skill.effectCaster:GetDirectTargetsNoExile()) + if targets==0 then + return false + end + end --角色没有真正死亡 在 被眩晕/沉默的 情况下 任然能释放死亡技能 if (self.ctrl_dizzy or self.ctrl_slient) and self:IsDead() and skill and skill.type==BattleSkillType.DeadSkill then return true diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua index 25ab3b6ca8..dde4102dea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua @@ -52,15 +52,6 @@ function Skill:GetOwner() end -- 是否可以释放 function Skill:canCastSkill() - if self.effectCaster then - --放技能前判断是否有目标,没有就不会放技能,直接执行技能回调 by 王振兴 2021/03/26 - --为解决攻击目标只剩被放逐的单位导致技能播放异常 - self.effectCaster:ChooseTarget() - local targets=BattleUtil.LengthOfTable(self:GetDirectTargetsNoExile()) - if targets==0 then - return false - end - end return true end