diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_zi.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_zi.png index ba184dbd7d..6b4e52d2b5 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_zi.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_zi.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab index d4128e99b3..16fe43c182 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab @@ -604,7 +604,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8569089439305530155} + - {fileID: 2144953859970798787} - {fileID: 6723476494361738373} - {fileID: 8928954161895885133} m_Father: {fileID: 9076740770643775636} @@ -958,89 +958,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &7045468943449311148 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8569089439305530155} - - component: {fileID: 9214972345286033504} - - component: {fileID: 5284812280716246775} - m_Layer: 0 - m_Name: live2d_c_swk_00015_s1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8569089439305530155 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7045468943449311148} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} - m_Children: [] - m_Father: {fileID: 2546753596356924735} - 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: -120.2} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9214972345286033504 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7045468943449311148} - m_CullTransparentMesh: 0 ---- !u!114 &5284812280716246775 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7045468943449311148} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} - 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 - skeletonDataAsset: {fileID: 11400000, guid: ac3046384544079458319dc8e946882e, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: idle - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 --- !u!1 &7476155718133357911 GameObject: m_ObjectHideFlags: 0 @@ -1285,7 +1202,8 @@ RectTransform: 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_Children: + - {fileID: 1977434122207590558} m_Father: {fileID: 2546753596356924735} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1479,3 +1397,117 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &9068964162782896134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2144953859970798787} + m_Layer: 5 + m_Name: liveRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2144953859970798787 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068964162782896134} + 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: 2546753596356924735} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9165157732576527603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1977434122207590558} + - component: {fileID: 170902021367277407} + - component: {fileID: 3679675375477093430} + m_Layer: 5 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1977434122207590558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9165157732576527603} + 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: 6723476494361738373} + 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: -169.93, y: -62} + m_SizeDelta: {x: 96.14, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &170902021367277407 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9165157732576527603} + m_CullTransparentMesh: 0 +--- !u!114 &3679675375477093430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9165157732576527603} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9725491, g: 0.83921576, b: 0.20000002, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 3 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 89 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5B59\u609F\u7A7A" diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 79126d312e..088a88e93f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -226,6 +226,9 @@ function this.LingShouUpCheckRed() local freeTime = 0 local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LingShouBaoGe) + if not ActData then + return false + end local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",ActData.activityId) local freeTimesId=lotterySetting[array[1].Id].FreeTimes if freeTimesId > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua index 2d774f413b..a3713d891a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua @@ -7,6 +7,7 @@ local properTypeConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) local rechargeConfigId = 0 local rechargeData = {} local fakeId = 0 +this.LiveObj = nil function ShengYiTianJiang:ctor(mainPanel, gameObject) self.mainPanel = mainPanel self.gameObject = gameObject @@ -21,6 +22,8 @@ function ShengYiTianJiang:InitComponent(gameObject) this.scrollItem = Util.GetGameObject(gameObject, "scroller/grid") this.proPertyText = Util.GetGameObject(gameObject, "layout/proPertyText"):GetComponent("Text") this.buytimes = Util.GetGameObject(gameObject, "layout/buytimes"):GetComponent("Text") + this.liveRoot = Util.GetGameObject(gameObject, "bg/liveRoot") + this.skinName = Util.GetGameObject(gameObject, "title/name"):GetComponent("Text") end --绑定事件(用于子类重写) @@ -91,16 +94,26 @@ function ShengYiTianJiang:OnShowData() local skinId = tonumber(strs[1]) fakeId = tonumber(strs[2]) local skinConfig = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId) - local heroSkinSingleProVal = {} - for _,v in ipairs(skinConfig.MonomerProperty) do - if not heroSkinSingleProVal[v[1]] then - heroSkinSingleProVal[v[1]] = 0 - end - heroSkinSingleProVal[v[1]] = heroSkinSingleProVal[v[1]] + v[2] - end + if this.LiveObj then + poolManager:UnLoadLive(this.LiveObj.name,this.LiveObj) + this.LiveObj = nil + end this.proPertyText.text = "属性加成:" - for k,v in pairs(heroSkinSingleProVal) do - this.proPertyText.text = this.proPertyText.text..properTypeConfig[k].Info.."+"..GetPropertyFormatStr(properTypeConfig[k].Style,v) + if not skinConfig then + else + LogGreen(skinConfig.Live.." name:"..GetResourcePath(skinConfig.Live)) + this.LiveObj = poolManager:LoadLive(GetResourcePath(skinConfig.Live),this.liveRoot.transform, Vector3.one * skinConfig.Scale, Vector3.New(skinConfig.Position[1], skinConfig.Position[2], 0)) + this.skinName.text = ConfigManager.GetConfigData(ConfigName.HeroConfig,skinConfig.HeroId).ReadingName + local heroSkinSingleProVal = {} + for _,v in ipairs(skinConfig.MonomerProperty) do + if not heroSkinSingleProVal[v[1]] then + heroSkinSingleProVal[v[1]] = 0 + end + heroSkinSingleProVal[v[1]] = heroSkinSingleProVal[v[1]] + v[2] + end + for k,v in pairs(heroSkinSingleProVal) do + this.proPertyText.text = this.proPertyText.text..properTypeConfig[k].Info.."+"..GetPropertyFormatStr(properTypeConfig[k].Style,v) + end end rechargeData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.DirectPurchaseGift, rechargeConfigId) @@ -153,6 +166,10 @@ function ShengYiTianJiang:OnDestroy() self.timer:Stop() self.timer = nil end + if this.LiveObj then + poolManager:UnLoadLive(this.LiveObj.name,this.LiveObj) + this.LiveObj = nil + end sortingOrder = 0 itemsGrid = {} end