From 80e2cab5897e9548c5dc6d5c0a3d7c6db692edad Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 23 Sep 2021 16:50:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=8E=B2=E7=8F=91=E5=AE=9D=E9=95=9C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=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/~Lua/Common/GlobalDefine.lua | 2 ++ Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 0c9ab50369..d2707e6b57 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1117,6 +1117,8 @@ JumpType = { SurpriseBox = 40001,--惊喜礼盒 linglongShangShi = 20005, + + linglongBaojing = 10067 } NPCPosType={ diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index fd7a497a6d..0e0ad7ed1e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -785,6 +785,9 @@ local jumpDic = { return end end, + [JumpType.linglongBaojing] = function(data) + this.JumpActivity(JumpType.linglongBaojing % 10000,data[1]) + end, } function this.JumpActivity(data,skipfactor) From ee5182dcedd332843ff0eb40d66e4af84724e4a8 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 23 Sep 2021 16:59:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=8E=B2=E7=8F=91=E5=AE=9D=E9=95=9C?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/linglong/LingLongBaoJingPanel.prefab | 375 ++++++++++++++++++ .../linglongbaojing/LingLongBaoJingPanel.lua | 5 + 2 files changed, 380 insertions(+) diff --git a/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab index 06c9c3a3e8..7af92a46dd 100644 --- a/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab @@ -1397,6 +1397,7 @@ RectTransform: - {fileID: 2146154464638186534} - {fileID: 4564385290114756062} - {fileID: 6946039974967129058} + - {fileID: 2408581268303862332} m_Father: {fileID: 7314005397260952399} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6778,6 +6779,7 @@ RectTransform: - {fileID: 5592352666856063049} - {fileID: 8449191505964761681} - {fileID: 322471593265771002} + - {fileID: 3276396561316616318} m_Father: {fileID: 7314005397260952399} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7716,6 +7718,80 @@ MonoBehaviour: m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2820926101374535443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5468297957613121618} + - component: {fileID: 2423450604954316356} + - component: {fileID: 7373254357985245181} + m_Layer: 5 + m_Name: yiLingQu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5468297957613121618 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2820926101374535443} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 8418905276674744645} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -34.43, y: -40} + m_SizeDelta: {x: 190, y: 116} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2423450604954316356 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2820926101374535443} + m_CullTransparentMesh: 0 +--- !u!114 &7373254357985245181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2820926101374535443} + 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: 9cb4aa53aa218974fa09913ff23f3fd5, 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 &2844370802417861093 GameObject: m_ObjectHideFlags: 0 @@ -10419,6 +10495,80 @@ RectTransform: m_AnchoredPosition: {x: 239.8, y: -365} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3831454428041665165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2408581268303862332} + - component: {fileID: 2948760503956761772} + - component: {fileID: 6367583292175264457} + m_Layer: 5 + m_Name: yiLingQu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2408581268303862332 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3831454428041665165} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 535106102971884104} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -34.43, y: -40} + m_SizeDelta: {x: 190, y: 116} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2948760503956761772 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3831454428041665165} + m_CullTransparentMesh: 0 +--- !u!114 &6367583292175264457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3831454428041665165} + 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: 9cb4aa53aa218974fa09913ff23f3fd5, 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 &3842212735513990879 GameObject: m_ObjectHideFlags: 0 @@ -10829,6 +10979,7 @@ RectTransform: - {fileID: 3165101782642376210} - {fileID: 5385604371865452983} - {fileID: 4643541344365118740} + - {fileID: 1711949614215707712} m_Father: {fileID: 7314005397260952399} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14130,6 +14281,7 @@ RectTransform: - {fileID: 4004301192061346884} - {fileID: 4116638233221288530} - {fileID: 2445718243079068566} + - {fileID: 5468297957613121618} m_Father: {fileID: 7314005397260952399} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14496,6 +14648,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5898204213419251402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1711949614215707712} + - component: {fileID: 1217105310945273156} + - component: {fileID: 8534304508852109706} + m_Layer: 5 + m_Name: yiLingQu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1711949614215707712 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5898204213419251402} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 9187756740145594409} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -48.25003, y: -51.25} + m_SizeDelta: {x: 190, y: 116} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1217105310945273156 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5898204213419251402} + m_CullTransparentMesh: 0 +--- !u!114 &8534304508852109706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5898204213419251402} + 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: 9cb4aa53aa218974fa09913ff23f3fd5, 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 &5908966962999596833 GameObject: m_ObjectHideFlags: 0 @@ -15911,6 +16137,7 @@ RectTransform: - {fileID: 6292182616561157197} - {fileID: 1581439206873845259} - {fileID: 2815350693209256519} + - {fileID: 5646022398931614192} m_Father: {fileID: 7314005397260952399} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -16665,6 +16892,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6923180132029796481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3276396561316616318} + - component: {fileID: 8961940510010739707} + - component: {fileID: 4071441640208568479} + m_Layer: 5 + m_Name: yiLingQu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3276396561316616318 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6923180132029796481} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 6867791576146055993} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -34.43, y: -40} + m_SizeDelta: {x: 190, y: 116} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8961940510010739707 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6923180132029796481} + m_CullTransparentMesh: 0 +--- !u!114 &4071441640208568479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6923180132029796481} + 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: 9cb4aa53aa218974fa09913ff23f3fd5, 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 &6935262382617998088 GameObject: m_ObjectHideFlags: 0 @@ -19977,6 +20278,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 164.9, y: 215.4} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8239268513522154750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5646022398931614192} + - component: {fileID: 8553542967560876966} + - component: {fileID: 3736717586019433322} + m_Layer: 5 + m_Name: yiLingQu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5646022398931614192 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8239268513522154750} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 2703596499720766253} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -34.43, y: -40} + m_SizeDelta: {x: 190, y: 116} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8553542967560876966 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8239268513522154750} + m_CullTransparentMesh: 0 +--- !u!114 &3736717586019433322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8239268513522154750} + 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: 9cb4aa53aa218974fa09913ff23f3fd5, 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 &8270970612023208711 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua index 0fb81db209..5d89c2fb44 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua @@ -111,6 +111,7 @@ function LingLongBaoJingPanel:InitComponent(gameObject) self.rewardBoxList[i] = {} end self.rewardBoxList[i].go=Util.GetGameObject(self.rewardBox,"Item"..i) + self.rewardBoxList[i].yiLingQu=Util.GetGameObject(self.rewardBoxList[i].go,"yiLingQu") self.rewardBoxList[i].icon =Util.GetGameObject(self.rewardBoxList[i].go,"BG"):GetComponent("Image")--幸运值 self.rewardBoxList[i].value =Util.GetGameObject(self.rewardBoxList[i].go,"Value"):GetComponent("Text")--幸运值 self.rewardBoxList[i].redPoint=Util.GetGameObject(self.rewardBoxList[i].go,"redPoint") @@ -634,6 +635,7 @@ function LingLongBaoJingPanel:RefreshProgress(index) self.luckyValueNum.text = actconfigs.mission[1].progress.."/"..configs[#configs].Values[1][1] if index and index > 0 then self.rewardBoxList[index].redPoint.gameObject:SetActive(false) + self.rewardBoxList[index].yiLingQu.gameObject:SetActive(true) else for i = 1,#self.rewardBoxList do local mission = ActivityGiftManager.GetActivityInfo(self.actId,configs[i].Id) @@ -641,6 +643,9 @@ function LingLongBaoJingPanel:RefreshProgress(index) self.rewardBoxList[i].redPoint.gameObject:SetActive(true) else self.rewardBoxList[i].redPoint.gameObject:SetActive(false) + if mission.progress >= configs[i].Values[1][1] and mission.state == 1 then + self.rewardBoxList[i].yiLingQu.gameObject:SetActive(true) + end end end end From a255a6fb42586f0e39486e31f893b8bba779b42c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 23 Sep 2021 17:25:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8C=BA=E5=9F=9F?= =?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 --- .../Prefabs/UI/linglong/LingLongBaoJingPanel.prefab | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab index 7af92a46dd..c11e0bd388 100644 --- a/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab @@ -7852,7 +7852,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -14158,7 +14158,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -17763,7 +17763,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -18023,7 +18023,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] From 0d76922c85282af7b424071dd2d1a10f51423745 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 23 Sep 2021 17:54:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E3=80=91?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=BC=96=E9=98=9F=E6=97=B6=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E7=BC=96=E9=98=9F=E7=9A=84=E6=96=B9=E6=B3=95=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/FormationManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 0198d7a43c..0fb4bb7eff 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -91,7 +91,7 @@ function this.UpdateFormation(msg) oTeam.teamPokemonInfos = {} this.formationList[team.teamId] = oTeam if isRefresh then - FormationManager.RefreshFormation(team.teamId, this.formationList[team.teamId].teamHeroInfos, {}) + FormationManager.SaveFormation(team.teamId, this.formationList[team.teamId].teamHeroInfos, {}) end end