diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab index 0c76cdf287..0e19b1e675 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab @@ -67,7 +67,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0ed637e25bbb8c54ba3d6b2d1a20113c, type: 3} + m_Sprite: {fileID: 21300000, guid: 5380aa771cac9fe41b6293aeae6ca070, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab index 1ceb9b9f07..244e1824f7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab @@ -46242,7 +46242,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &8490762429051405974 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab index 1489cc9679..b410bd3549 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab @@ -838,7 +838,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224172487803996794 RectTransform: m_ObjectHideFlags: 0 @@ -2758,6 +2758,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 216, y: 410} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &452511744204117810 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5023853526277665288} + - component: {fileID: 2164890353251220410} + - component: {fileID: 7208942450161516429} + m_Layer: 5 + m_Name: itemIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5023853526277665288 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 452511744204117810} + 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: 7103197795649631257} + 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} + m_AnchoredPosition: {x: 49.6, y: -43.9} + m_SizeDelta: {x: 156, y: 136} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2164890353251220410 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 452511744204117810} + m_CullTransparentMesh: 0 +--- !u!114 &7208942450161516429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 452511744204117810} + 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: de6cd38183296a14c8a07417420b1763, 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 &1332992662678900222 GameObject: m_ObjectHideFlags: 0 @@ -2770,7 +2844,7 @@ GameObject: - component: {fileID: 1774442815417035457} - component: {fileID: 6515888612639204120} m_Layer: 5 - m_Name: itemName + m_Name: itemNum m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2792,7 +2866,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: -48} + m_AnchoredPosition: {x: -25.79, y: -48.214993} m_SizeDelta: {x: 188.58, y: 46.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1774442815417035457 @@ -2836,7 +2910,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u8FD9\u662F\u4E94\u4E2A\u5B57" + m_Text: 200 LanguageIndex: 10412 --- !u!1 &1441967148426221267 GameObject: @@ -4553,6 +4627,7 @@ RectTransform: - {fileID: 224192950655719764} - {fileID: 224686678241914128} - {fileID: 3184820659047775435} + - {fileID: 5023853526277665288} m_Father: {fileID: 224496811525665260} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/PublicArtRes/Materials/xuanwo_002_alpha.mat b/Assets/ManagedResources/PublicArtRes/Materials/xuanwo_002_alpha.mat index 0cc5bca299..da25ba8773 100644 --- a/Assets/ManagedResources/PublicArtRes/Materials/xuanwo_002_alpha.mat +++ b/Assets/ManagedResources/PublicArtRes/Materials/xuanwo_002_alpha.mat @@ -40,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 980850705a8a71b40ab9405c86c215a2, type: 3} + m_Texture: {fileID: 2800000, guid: c5400ec8080390e4e88f0f91c6cdfaaa, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/ManagedResources/PublicArtRes/Materials/xuanwo_003_add.mat b/Assets/ManagedResources/PublicArtRes/Materials/xuanwo_003_add.mat index 64dc198898..376525b489 100644 --- a/Assets/ManagedResources/PublicArtRes/Materials/xuanwo_003_add.mat +++ b/Assets/ManagedResources/PublicArtRes/Materials/xuanwo_003_add.mat @@ -40,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 980850705a8a71b40ab9405c86c215a2, type: 3} + m_Texture: {fileID: 2800000, guid: c5400ec8080390e4e88f0f91c6cdfaaa, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 42e06fcfb2..145afc1f80 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1822,4 +1822,13 @@ end function GetEquipSuitStr(Star,num) return string.format(Language[12057],num,QualityNameDef[ ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig,"Star",Star).Quality],ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,Star).Stars) +end + +-- 绑定扫光特效的资源 +function BindLightFlash(light, target) + local meshrender = light.gameObject:GetComponent("MeshRenderer") + local m = meshrender.material + + local texture = target.gameObject:GetComponent("Image").mainTexture + m:SetTexture("_Mask", texture) end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index f1a9e596b8..61c28ab378 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -11,27 +11,27 @@ function ATM_MainMatchView:InitComponent() this.containPanel = Util.GetGameObject(self.gameObject, "contain") this.lockPanel = Util.GetGameObject(self.gameObject, "contain/LockBg") - this.lockContext = Util.GetGameObject(this.lockPanel, "context"):GetComponent("Text") - this.lockTime = Util.GetGameObject(this.lockPanel, "JoinRoot/time"):GetComponent("Text") - this.lockTip = Util.GetGameObject(this.lockPanel, "JoinRoot/tip"):GetComponent("Text") - this.outTip = Util.GetGameObject(this.lockPanel, "OutRoot/Text"):GetComponent("Text") - this.WeedOutText = Util.GetGameObject(this.lockPanel, "WeedOutRoot/Text"):GetComponent("Text") - this.WeedOutMyRank = Util.GetGameObject(this.lockPanel, "WeedOutRoot/MyRank"):GetComponent("Text") - this.WeedOutMyRankText = Util.GetGameObject(this.lockPanel, "WeedOutRoot/MyRank/Text"):GetComponent("Text") - this.WeedOutBestRank = Util.GetGameObject(this.lockPanel, "WeedOutRoot/BestRank"):GetComponent("Text") - this.WeedOutBestRankText = Util.GetGameObject(this.lockPanel, "WeedOutRoot/BestRank/Text"):GetComponent("Text") + this.lockContext = Util.GetGameObject(this.lockPanel, "GameObject/OutRoot/context"):GetComponent("Text") + this.lockTime = Util.GetGameObject(this.lockPanel, "GameObject/JoinRoot/time"):GetComponent("Text") + this.lockTip = Util.GetGameObject(this.lockPanel, "GameObject/JoinRoot/tip"):GetComponent("Text") + this.outTip = Util.GetGameObject(this.lockPanel, "GameObject/OutRoot/Text"):GetComponent("Text") + this.WeedOutText = Util.GetGameObject(this.lockPanel, "GameObject/WeedOutRoot/Text"):GetComponent("Text") + this.WeedOutMyRank = Util.GetGameObject(this.lockPanel, "GameObject/WeedOutRoot/MyRank"):GetComponent("Text") + this.WeedOutMyRankText = Util.GetGameObject(this.lockPanel, "GameObject/WeedOutRoot/MyRank/Text"):GetComponent("Text") + this.WeedOutBestRank = Util.GetGameObject(this.lockPanel, "GameObject/WeedOutRoot/BestRank"):GetComponent("Text") + this.WeedOutBestRankText = Util.GetGameObject(this.lockPanel, "GameObject/WeedOutRoot/BestRank/Text"):GetComponent("Text") - this.lockIn = Util.GetGameObject(this.lockPanel, "JoinRoot") - this.lockOut = Util.GetGameObject(this.lockPanel, "OutRoot") - this.WeedOutRoot = Util.GetGameObject(this.lockPanel, "WeedOutRoot") + this.lockIn = Util.GetGameObject(this.lockPanel, "GameObject/JoinRoot") + this.lockOut = Util.GetGameObject(this.lockPanel, "GameObject/OutRoot") + this.WeedOutRoot = Util.GetGameObject(this.lockPanel, "GameObject/WeedOutRoot") this.effect = Util.GetGameObject(self.gameObject, "bg/UI_effect_ArenaMainPanel_particle") - this.orggroup = Util.GetGameObject(this.lockPanel, "orggroup") - this.Demons = Util.GetGameObject(this.lockPanel, "Demons") + this.orggroup = Util.GetGameObject(self.gameObject, "contain/orggroup") + this.Demons = Util.GetGameObject(self.gameObject, "contain/Demons") this.myBaby = {} for i = 1, 6 do - this.myBaby[i] = Util.GetGameObject(this.lockPanel,"Demons/heroPro (" .. i .. ")") + this.myBaby[i] = Util.GetGameObject(this.Demons,"heroPro (" .. i .. ")") end end @@ -235,6 +235,7 @@ function this.FreshTeam() local formation = FormationManager.GetFormationByID(FormationTypeDef.ARENA_TOM_MATCH) for i, hero in ipairs(formation.teamHeroInfos) do local heroData = HeroManager.GetSingleHeroData(hero.heroId) + LogError(hero.position) local heroGo = Util.GetGameObject(this.myBaby[hero.position], "hero") heroGo:SetActive(true) Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = heroData.lv diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua index 697d3f6388..fe7740a5bc 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua @@ -57,6 +57,10 @@ function FirstRechargePanel:InitComponent() self.qianyao = Util.GetGameObject(self.transform, "qianyao") self.ani = self.transform:GetComponent("Animator") -- effectAdapte(Util.GetGameObject(self.effect, "Partical/ziti mask (1)")) + + BindLightFlash(Util.GetGameObject(self.effect, "saoguang"), Util.GetGameObject(self.frame, "bg_piaodai/Image (3)")) + BindLightFlash(Util.GetGameObject(self.effect, "saoguang (1)"), self.reChargeBtn) + end function FirstRechargePanel:BindEvent() diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 172e2bfa59..0fb7a329cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -55,6 +55,10 @@ function this:InitComponent() this.versionText = Util.GetGameObject(this.loginPart, "version"):GetComponent("Text") this.versionText.text = Language[11136]..LoginRoot_Version + + + + BindLightFlash(Util.GetGameObject(this.btnLoginPart, "effect (1)/saoguang"), Util.GetGameObject(this.gameObject, "logo")) end --绑定事件（用于子类重写） diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua index 48dd9c96e9..7ad516ea3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua @@ -68,7 +68,8 @@ function SupremeHeroPopup:InitComponent() effectAdapte(Util.GetGameObject(this.effectRoot, "saoguang (2)")) -- effectAdapte(Util.GetGameObject(this.effectRoot, "normal/kuang03/biankuang03")) -- effectAdapte(Util.GetGameObject(this.effectRoot, "normal/kuang03/saoguang03")) - + BindLightFlash(Util.GetGameObject(this.effectRoot, "saoguang"), Util.GetGameObject(this.middle, "sword/image (2)")) + this.LoadLive2D() end diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index e25f50fceb..1d060fec69 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -529,13 +529,13 @@ function this:RechargeShopItemAdapter(shopItem, itemData) local first = Util.GetGameObject(shopItem, "first") local firstNum = Util.GetGameObject(shopItem, "first/Text"):GetComponent("Text") local icon = Util.GetGameObject(shopItem, "icon"):GetComponent("Image") - local num = Util.GetGameObject(shopItem, "itemName"):GetComponent("Text") + local num = Util.GetGameObject(shopItem, "itemNum"):GetComponent("Text") local price = Util.GetGameObject(shopItem, "price/Text"):GetComponent("Text") -- 计算数据 local itemInfo = ShopManager.GetRechargeItemInfo(itemData.goodsId) icon.sprite = Util.LoadSprite(GetResourcePath(itemInfo.Resources)) - num.text = GetLanguageStrById(itemInfo.Name) + num.text = itemInfo.BaseReward[1][2] price.text = MoneyUtil.GetMoneyMark() .. MoneyUtil.GetMoney(itemInfo.Price) -- 判断首充赠送