From 4678a7e6ed467b8d5118ad3729c9fd8248a82d12 Mon Sep 17 00:00:00 2001 From: shihongyi Date: Mon, 13 Jul 2020 16:40:59 +0800 Subject: [PATCH 1/3] vipbugfix --- data_execl/base_data/TaskConfig.xlsx | Bin 48912 -> 48944 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data_execl/base_data/TaskConfig.xlsx b/data_execl/base_data/TaskConfig.xlsx index 16ea23d1246f4fe7c51a24c79092f9ca14a74030..8e8d8c82b9aa4761c5d93939adafbcd91cacdbcf 100644 GIT binary patch delta 15493 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 N=oNt$`uQKW{{;vfu(kjI delta 15465 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 Date: Mon, 13 Jul 2020 16:41:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B0=8F=E6=B8=B8?= =?UTF-8?q?=E6=88=8Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Map/TrialMiniGamePanel.prefab | 130 ++++++++++++++++-- .../Map/TrialMiniGame/Logic/Game_14.lua | 13 +- .../Map/TrialMiniGame/Logic/Game_16.lua | 5 + .../Map/TrialMiniGame/Logic/Game_17.lua | 11 +- .../Map/TrialMiniGame/Logic/Game_18.lua | 6 + 5 files changed, 150 insertions(+), 15 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab index 072fab321b..d8741fd901 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab @@ -681,7 +681,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3472270698266781006} + - component: {fileID: 3470195748214042733} + - component: {fileID: 3438442689703484279} m_Layer: 0 m_Name: Game_18 m_TagString: Untagged @@ -689,8 +690,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!4 &3472270698266781006 -Transform: +--- !u!224 &3470195748214042733 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -704,10 +705,24 @@ Transform: - {fileID: 6154318554534933948} - {fileID: 6181458139143078872} - {fileID: 4187306671584326201} + - {fileID: 5726404457783881133} - {fileID: 9077118300160263819} m_Father: {fileID: 1280518217681842888} m_RootOrder: 6 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: 1080, y: 1897} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3438442689703484279 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91198398964448359} + m_CullTransparentMesh: 0 --- !u!1 &120764374100435940 GameObject: m_ObjectHideFlags: 0 @@ -1260,6 +1275,7 @@ GameObject: m_Component: - component: {fileID: 8343060592706080390} - component: {fileID: 8925629893475097646} + - component: {fileID: 1204353047038332442} m_Layer: 5 m_Name: icon m_TagString: Untagged @@ -1294,6 +1310,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 674705665733374592} m_CullTransparentMesh: 0 +--- !u!114 &1204353047038332442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674705665733374592} + 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: 0} + 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 &678146947055905716 GameObject: m_ObjectHideFlags: 0 @@ -1743,7 +1788,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1544318702661827868} - m_Father: {fileID: 3472270698266781006} + m_Father: {fileID: 3470195748214042733} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2189,8 +2234,8 @@ RectTransform: m_LocalScale: {x: 2.9121184, y: 2.9121184, z: 2.9121184} m_Children: - {fileID: 760474955983389260} - m_Father: {fileID: 3472270698266781006} - m_RootOrder: 4 + m_Father: {fileID: 3470195748214042733} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3934,7 +3979,7 @@ RectTransform: - {fileID: 6453343601413579126} - {fileID: 1333514904258367921} - {fileID: 2499330597335303844} - m_Father: {fileID: 3472270698266781006} + m_Father: {fileID: 3470195748214042733} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -6369,7 +6414,7 @@ RectTransform: - {fileID: 787863531} - {fileID: 5695942863401039707} - {fileID: 948311900591901430} - - {fileID: 3472270698266781006} + - {fileID: 3470195748214042733} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7370,7 +7415,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3472270698266781006} + m_Father: {fileID: 3470195748214042733} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -12214,7 +12259,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3472270698266781006} + m_Father: {fileID: 3470195748214042733} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -15010,6 +15055,71 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8980922047069217908} m_CullTransparentMesh: 0 +--- !u!1 &8986016928859608297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5726404457783881133} + - component: {fileID: 7165313727292324804} + - component: {fileID: 1638231052686179209} + m_Layer: 0 + m_Name: empty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5726404457783881133 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986016928859608297} + 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: 3470195748214042733} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7165313727292324804 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986016928859608297} + m_CullTransparentMesh: 0 +--- !u!114 &1638231052686179209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986016928859608297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &9010989798139851598 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua index efc4ce7bef..03d335df83 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua @@ -2,6 +2,7 @@ local this = Game_14 local _itemsList = {} local _iconList = {} +local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) function this.Init(context, root, gameType, gameId, gameParams) this.root = root this.gameType = gameType @@ -30,13 +31,19 @@ function this.Show() if not _itemsList[index] then _itemsList[index] = newObjToParent(this.itemPre, this.itemsLayout) - local icon = Util.GetGameObject(_itemsList[index], "icon") + local icon = Util.GetGameObject(_itemsList[index], "icon"):GetComponent("Image") local btnSure = Util.GetGameObject(_itemsList[index], "btnAns") + local data = ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig,"Id",tonumber(answerId)) + + -- if not _iconList[index] then + -- _iconList[index] = SubUIManager.Open(SubUIConfig.ItemView,icon.transform) + -- end + -- _iconList[index]:OnOpen(false,{answerId,1},1.1,false) if not _iconList[index] then - _iconList[index] = SubUIManager.Open(SubUIConfig.ItemView,icon.transform) + _iconList[index] = icon end - _iconList[index]:OnOpen(false,{answerId,1},1.1,false) + _iconList[index].sprite = Util.LoadSprite(GetResourcePath(data.Icon)) Util.AddOnceClick(btnSure, function() this.ChooseAnswer(index) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_16.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_16.lua index ab4b82a02f..97f09c9981 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_16.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_16.lua @@ -7,14 +7,17 @@ function this.Init(context, root, gameType, gameId, gameParams) this.TrialGameConfig = ConfigManager.GetConfig(ConfigName.TrialGameConfig) this.Text = Util.GetGameObject(this.root, "middle/startDraw/canRechargeTimebg/Text"):GetComponent("Text") this.startDrawBtn = Util.GetGameObject(this.root, "middle/startDraw/startDrawBtn") + this.startDrawBtn:GetComponent("Button").interactable = true this.anim = Util.GetGameObject(this.root, "middle/number/anim") this.anim.transform.localPosition = Vector2.New(18, -58) this.NumView = SubUIManager.Open(SubUIConfig.NumberView, this.anim.transform, "r_fxgz_shuzi_", Vector2.New(80, 120), Vector2.New(50, 30), 0, 99999) + end function this.Show() this.root:SetActive(true) Util.AddOnceClick(this.startDrawBtn,function() + this.startDrawBtn:GetComponent("Button").interactable = false this.OnRefreshItemNumShow(this.gameId) end) end @@ -25,6 +28,7 @@ function this.OnRefreshItemNumShow(index) --ToDo动画显示 this.NumView:SetNum(0) this.NumView:DOItemNum(dropNumbers, function(index, num, item) + -- itemList[index]=item item:Move(tostring(num), index * 0.5 + 2, true, 3) end) local timerEffect = Timer.New(function() @@ -34,6 +38,7 @@ function this.OnRefreshItemNumShow(index) -- end if TrialMiniGameManager.IsGameDone() then TrialMiniGameManager.EndGame() + this.NumView.gameObject:SetActive(false) end local data = TrialMiniGameManager.IdToNameIconNum(msg.drop.itemlist[1].itemId,msg.drop.itemlist[1].itemNum) PopupTipPanel.ShowColorTip(data[1],data[2],data[3]) 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 d9918fdcf7..e394054141 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua @@ -12,6 +12,7 @@ function this.Init(context, root, gameType, gameId, gameParams) this.list={}--Id的List this.items = Util.GetGameObject(this.root,"items") this.btnStart = Util.GetGameObject(this.root,"Button") + this.btnStart:GetComponent("Button").interactable = true this.itemsList = {}--12个框的List\ this.ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) this.ArtConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) @@ -29,7 +30,9 @@ end function this.Show() this.root:SetActive(true) - this.liveNode = poolManager:LoadLive("live2d_c_yj_00040", this.liveRoot.transform, Vector3.one, Vector3.New(0,200, 0)) + this.liveNode = poolManager:LoadLive("live2d_c_yj_00040", this.liveRoot.transform, Vector3.one, Vector3.New(0,200, 0)) + local red = Util.GetGameObject(this.itemsList[1],"Red") + red:SetActive(true) for index, item in pairs(this.itemsList) do local reward = Util.GetGameObject(item,"reward"):GetComponent("Image") @@ -53,7 +56,7 @@ function this.Show() end local data = TrialMiniGameManager.IdToNameIconNum(msg.drop.itemlist[1].itemId,msg.drop.itemlist[1].itemNum) PopupTipPanel.ShowColorTip(data[1],data[2],data[3]) - end, 4,1,true):Start() + end, 3,1,true):Start() end) end) end @@ -97,6 +100,10 @@ end function this.Close() this.root:SetActive(false) + for index, value in ipairs(this.itemsList) do + local red = Util.GetGameObject(this.itemsList[index],"Red") + red:SetActive(false) + end poolManager:UnLoadLive("live2d_c_yj_00040", this.liveNode) index = 1 if this.turnEffect2 then diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua index d5b2b8a8ea..4ba19276d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua @@ -19,6 +19,7 @@ function this.Init(context, root, gameType, gameId, gameParams) this.itemsLayout = Util.GetGameObject(root, "Layout") this.itemPre = Util.GetGameObject(root, "Layout/itemPre") this.btn = Util.GetGameObject(root, "btnStart") + this.empty = Util.GetGameObject(root, "empty") this.gameConfig = ConfigManager.GetConfig(ConfigName.TrialGameConfig) this.itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) this.atrConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) @@ -30,6 +31,7 @@ end function this.Show() this.root:SetActive(true) + this.empty:SetActive(true) this.liveNode = poolManager:LoadLive("live2d_c_yj_00040", this.liveRoot.transform, Vector3.one * 0.75, Vector3.New(0,190, 0)) --数据乱序操作 @@ -42,6 +44,7 @@ function this.Show() Util.AddOnceClick(this.btn,function()--所有的 正->背 local thread=coroutine.start(function() + this.empty:SetActive(true) this.btn:SetActive(false) for index, value in ipairs(_itemsList) do local cFront = Util.GetGameObject(_itemsList[index], "front") @@ -63,6 +66,7 @@ function this.Show() --重新发牌 isActive = false this.SetCard(this.gameParams) + this.empty:SetActive(false) end) end) @@ -71,6 +75,7 @@ function this.Show() local cBack = Util.GetGameObject(_itemsList[index], "back") Util.AddOnceClick(cBack,function() local thread=coroutine.start(function() + this.empty:SetActive(true) cBack.transform:DORotate(Vector3.New(0, 90, 0), 0.3) coroutine.wait(0.3) cFront.transform:DORotate(Vector3.New(0, 0, 0), 0.3) @@ -89,6 +94,7 @@ function this.Show() end end end) + this.empty:SetActive(false) end) end) From d16ecd259af68eb04e7da097affe24d807ec5f61 Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Mon, 13 Jul 2020 16:46:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E3=80=91?= =?UTF-8?q?=E5=85=AC=E4=BC=9A=E6=88=90=E5=91=98=E4=BF=A1=E6=81=AF=E7=82=B9?= =?UTF-8?q?=E5=BC=80=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/GuildMemberInfoPopup.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua index b4144560c6..85e7adb78f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua @@ -102,7 +102,7 @@ function GuildMemberInfoPopup:BindEvent() PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GOODFRIEND)) return end - if GoodFriendManager.IsInBlackList(this._PlayerId) then + if GoodFriendManager.IsInBlackList(this._MemId) then PopupTipPanel.ShowTip(Language[10817]) return end @@ -292,12 +292,11 @@ function this.FormationAdapter(teamInfo) local frameBtn = Util.GetGameObject(this.Demons[hero.position], "frame") local heroData = {} Util.AddOnceClick(frameBtn, function() - NetManager.ViewHeroInfoRequest(this._PlayerId,hero.heroid,function(msg) + NetManager.ViewHeroInfoRequest(this._MemId,hero.heroid,function(msg) heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill) GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId) UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true) end) - end) end end