diff --git a/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png b/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png new file mode 100644 index 0000000000..7cb0985a28 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png.meta b/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png.meta new file mode 100644 index 0000000000..19f2649844 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 063058bfcd8740144ae855e56d755855 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b3281f9d64d382a4487d6c1e6fea7022 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ArenaAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index f86e032a4c..93c02a3a43 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -902,7 +902,7 @@ GameObject: m_Component: - component: {fileID: 1749564513666807311} - component: {fileID: 5862088432759568500} - - component: {fileID: 5904280449735229110} + - component: {fileID: 6363807631240224676} m_Layer: 5 m_Name: deadObj m_TagString: Untagged @@ -926,8 +926,8 @@ 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: 14.285736, y: 19.857117} - m_SizeDelta: {x: 67.95, y: 30} + m_AnchoredPosition: {x: 50.999996, y: 20.5} + m_SizeDelta: {x: 46, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5862088432759568500 CanvasRenderer: @@ -937,7 +937,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2523366928776616017} m_CullTransparentMesh: 0 ---- !u!114 &5904280449735229110 +--- !u!114 &6363807631240224676 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -946,31 +946,26 @@ MonoBehaviour: m_GameObject: {fileID: 2523366928776616017} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.990566, g: 0.98589355, b: 0.98589355, a: 1} + 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_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u9635\u4EA1" + 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 &2658533052818541386 GameObject: m_ObjectHideFlags: 0 @@ -3334,7 +3329,7 @@ GameObject: m_Component: - component: {fileID: 1546476454649784244} - component: {fileID: 5473746922102607565} - - component: {fileID: 3892143291985174656} + - component: {fileID: 2251792143694466160} m_Layer: 5 m_Name: deadObj m_TagString: Untagged @@ -3358,8 +3353,8 @@ 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: 25.428543, y: 19.857117} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 50.000008, y: 19.857117} + m_SizeDelta: {x: 46, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5473746922102607565 CanvasRenderer: @@ -3369,7 +3364,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7381184559301326831} m_CullTransparentMesh: 0 ---- !u!114 &3892143291985174656 +--- !u!114 &2251792143694466160 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3378,31 +3373,26 @@ MonoBehaviour: m_GameObject: {fileID: 7381184559301326831} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.990566, g: 0.98589355, b: 0.98589355, a: 1} + 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_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u9635\u4EA1" + 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 &7384883381373111011 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index 72ad8a8990..9e313c0140 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -340,6 +340,7 @@ function this.HeadAdapter(head,data,type) local lvText = Util.GetGameObject(head, "lv/Text"):GetComponent("Text") local starRoot = Util.GetGameObject(head, "star") local deadObj = Util.GetGameObject(head, "deadObj") + deadObj:GetComponent("Image").sprite=this.spLoader:LoadSprite("r_zhandou_zhenwang_zh") local aa=0 local frameStr="r_characterbg_goden" @@ -438,10 +439,18 @@ function this.HeadAdapter(head,data,type) icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(SpiritAnimal[id].Icon)) end if data.isRealDead and (type==1 or type==2 or type==3) then - Util.SetGray(icon.gameObject ,true) + -- Util.SetGray(icon.gameObject ,true) + -- Util.SetGray(frame.gameObject ,true) + -- Util.SetGray(protoIcon.gameObject ,true) + -- Util.SetGray(starRoot.gameObject ,true) + Util.SetGray(head.gameObject ,true) deadObj:SetActive(true) else - Util.SetGray(icon.gameObject,false) + -- Util.SetGray(icon.gameObject,false) + -- Util.SetGray(frame.gameObject ,false) + -- Util.SetGray(starRoot.gameObject ,false) + -- Util.SetGray(protoIcon.gameObject ,false) + Util.SetGray(head.gameObject ,false) deadObj:SetActive(false) end end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 8a2ba958d3..c7b37be884 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -138,14 +138,13 @@ function ActivityMainPanel:OnOpen(_activityType,_index,change) this:ClosePanel() end end - Log("_CurPageIndex:".._CurPageIndex) end -- 打开,重新打开时回调 function ActivityMainPanel:OnShow() SoundManager.PlayMusic(SoundConfig.BGM_Main) orginLayer = self.sortingOrder - LogGreen("_CurPageIndex OnShow:".._CurPageIndex) + Log("_CurPageIndex OnShow:".._CurPageIndex) if _CurPageIndex and (_CurPageIndex > #tabs or _CurPageIndex < 1) then _CurPageIndex = #tabs end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 3d667cb845..8b7eab3d03 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -152,12 +152,17 @@ function EveryDayGiftNew:SetGrowGift() --计算当前声望等级 if DynamicActivityManager.curLevel == 0 then for i = 1, #growData do - if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then - DynamicActivityManager.curLevel = i - if DynamicActivityManager.Index == 0 then - DynamicActivityManager.Index = DynamicActivityManager.curLevel + if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then + if rechargeNum ~= 0 then + DynamicActivityManager.curLevel = i + if DynamicActivityManager.Index == 0 then + DynamicActivityManager.Index = DynamicActivityManager.curLevel + end + break + else + DynamicActivityManager.curLevel = 1 + DynamicActivityManager.Index = 1 end - break end end end @@ -169,7 +174,7 @@ function EveryDayGiftNew:SetGrowGift() end end - -- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) + Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) --如果有当前声望数据,就显示,没有就显示上一档位 local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] self:RefreshReward(data) @@ -198,7 +203,7 @@ function EveryDayGiftNew:RefreshReward(Data) if DynamicActivityManager.Index < 2 then num = growData[2].data.shopItemData.BuyRule[2] elseif DynamicActivityManager.Index + 1 > #growData then - text = #growData + text = #growData-1 num = growData[#growData].data.shopItemData.BuyRule[2] else text = DynamicActivityManager.Index-1 @@ -206,10 +211,10 @@ function EveryDayGiftNew:RefreshReward(Data) end if DynamicActivityManager.curLevel <= 2 then self.tip.text = string.format("再充值%s元升至名望1",growData[2].data.shopItemData.BuyRule[2] - rechargeNum) - elseif DynamicActivityManager.curLevel + 1 > #growData then + elseif DynamicActivityManager.curLevel >= #growData and rechargeNum >= growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] then self.tip.text = "" else - self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel) + self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel-1) end local size = rechargeNum/num diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 817e22622c..6007aabd48 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -76,12 +76,17 @@ function RechargeViewNew:SetGrowGift() --计算当前声望等级 if DynamicActivityManager.curLevel == 0 then for i = 1, #growData do - if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then - DynamicActivityManager.curLevel = i - if DynamicActivityManager.Index == 0 then - DynamicActivityManager.Index = DynamicActivityManager.curLevel + if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then + if rechargeNum ~= 0 then + DynamicActivityManager.curLevel = i + if DynamicActivityManager.Index == 0 then + DynamicActivityManager.Index = DynamicActivityManager.curLevel + end + break + else + DynamicActivityManager.curLevel = 1 + DynamicActivityManager.Index = 1 end - break end end end @@ -93,7 +98,7 @@ function RechargeViewNew:SetGrowGift() end end - -- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) + Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) --如果有当前声望数据,就显示,没有就显示上一档位 local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] self:RefreshReward(data) @@ -122,7 +127,7 @@ function RechargeViewNew:RefreshReward(Data) if DynamicActivityManager.Index < 2 then num = growData[2].data.shopItemData.BuyRule[2] elseif DynamicActivityManager.Index + 1 > #growData then - text = #growData + text = #growData-1 num = growData[#growData].data.shopItemData.BuyRule[2] else text = DynamicActivityManager.Index-1 @@ -130,10 +135,10 @@ function RechargeViewNew:RefreshReward(Data) end if DynamicActivityManager.curLevel <= 2 then self.tip.text = string.format("再充值%s元升至名望1",growData[2].data.shopItemData.BuyRule[2] - rechargeNum) - elseif DynamicActivityManager.curLevel + 1 > #growData then + elseif DynamicActivityManager.curLevel + 1 >= #growData and rechargeNum >= growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] then self.tip.text = "" else - self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel) + self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel-1) end local size = rechargeNum/num