From fffb834f8a6ceaff98a37e130e455924223ed58f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 29 Dec 2020 11:26:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E6=8C=82=E6=9C=BA=E5=AE=9D=E7=AE=B1=E6=98=BE=E7=A4=BA=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E6=8C=82=E6=9C=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../g_guanka_baoxiangshijaintiao.png | Bin 0 -> 2189 bytes .../g_guanka_baoxiangshijaintiao.png.meta | 88 +++++++ .../UI/Fight/FightPointPassMainPanel.prefab | 218 +++++++++--------- .../~Lua/Common/functions.lua | 12 + .../Modules/Fight/View/InvadeMonsterView.lua | 12 +- 5 files changed, 220 insertions(+), 110 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/PublicAtlas/g_guanka_baoxiangshijaintiao.png create mode 100644 Assets/ManagedResources/Atlas/PublicAtlas/g_guanka_baoxiangshijaintiao.png.meta diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/g_guanka_baoxiangshijaintiao.png b/Assets/ManagedResources/Atlas/PublicAtlas/g_guanka_baoxiangshijaintiao.png new file mode 100644 index 0000000000000000000000000000000000000000..d87272876732b870624c3efcffdd398843b504fc GIT binary patch literal 2189 zcmV;82y*v{P) z4UVHm5QQ7hDRP>eCQ{D3cUfsQW7AP2P)bj){>xNKYA;Q zF;>wEw^y z`(k6s`f|+ubs+-U6`@^-=q$!LL~d9n-YDGISLOr5L+k5EMn4$8g%ZHxE-b+tREmgI zUvs+=cEehN6xn9&nb5Jikuu9VJPNJPk+H67lcof)7$qVstj+?jJLq=eF{_M?h3+16 z|2$XInga^jgVaUqbL6IGuD2!78LateL(cEcIxR|xr zH<#O+BNH#no!2Z=c5YFu_j}Y@ii*sv7)7nz%P9dYX7Daz6g6)RP_qu35(KfVI}|p? z1NxKJmS^>7F0D2nwy*Wy6YteooZbH=7M@25U@?m2vbIUL$Lp5~pEsYqzP#pF79_f*niXmZ z9ByMDR#aQFB(?WwR7{VmKN3_L`7o>?NO5Z-7xi8T0|Z_`z>Dr?f&iLZYmJNTSXtCf zmOMzg6^OaZ+S%-wM~UL$lmHf^WWJ75QC21@=n^9+a+WJ-iB%VW z+IclNmJ#{0(_m)B>K0u0E9oe@(Ff*>T*)@piQQJ`_0?bisWsB_*4C7`0Tbpo0}yiINqh%ox$W zD+*k^HD@f0dv0M1rn@x7@?>J7B`34`kwA(?k4iz|>RDVF8Z z#k23&G3-MgL$T2E`>>t1=E&-6^R~)a9ds#ipILy`yv|62i3Wcn+;-it1hAMPvX+Hw zY+f|;L$SUj%#y=4EDz9&6t6HxZ5(UpwU#@H0E-zSk>I9? zjK)fCLMb{QhSem;`A|e8nos9hb4Vn2Z^nH*Qjok9n>J{*y&WZh#SD>1Fna)LGupDp zN=cYNvKyH_5AZ<*5x*PE=E`yokwvM``in4|e)!PmXd?>xq|N;`&3E*i?fhIF>;-0?qoDLvMQp;+-g?F z=3}iXde&6N9cC7!{9uTzH;!^f%F1m;vjni1VP*}GE&Mm)reeFubN;YRQ^XCQ2dG7P zA4Dv(%&y_FK+-Iu7VH&_ie{=^31BgUXN_4FpydKvR*3b(LRJtWlGDfbyD_FD6KrAa zk*Jk7BUF~vYFWZru3R@vwJQNEM#&`p;_uj6SYJ(Rj+j~j51bS0??L9MtqDeQAhmJ5 z_MOy;rqG8P~Gl2;! zh;x_qy0QR^x5f*CXzrKx>uP9;SpkV=JP{h(MALLIY8Hxx6{N=v(}{8J%|7?t4+Jfqt`qWxoGN&7BJBQA(ka}wd?Dp_+-;}X6JEg zyAr_SJJ4LrWqTMxGuGl>q+KI7<{mA^aV!^`S(%O8C(Ht60`8^BcyqAY9N_|694W9P zVs?ouUIJLmkZ}VMFUqJ{Un~uV<;G|u<@KUvW+7f% z%d-S%7dG#AfAIkc);z4achXPv9PxaZ`<@ZRBN$D;`R+8B6eWPg*?8aVuwa5|Jufhl zaIJ|KE0cdrj4f*r%e?U#2xlh9bVeG?kz8WUjZgwuoP}I-n-ReVqN9Bk4j-a`0uo(^ zW9xq`?~nC`mY?MkYyC9E0+eJ^d%X5X*GF#a0xv&*{kW|<7q@5K{!rvrcx|LEJGKfT z+v`5J?N8|Qi?n@gX)^0}T+ZVq`sz^j67^qVzl;4BIrb&SmfQO;+kJ}hUNGmUsQ(mo zIvkgC=rDgdUW50qLwSc|a$By2;x@BNwelT2F3WM-i;PDs_{{PDXs!PPj>xXI8d^=0 P00000NkvXXu0mjfo@gUt literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/g_guanka_baoxiangshijaintiao.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/g_guanka_baoxiangshijaintiao.png.meta new file mode 100644 index 0000000000..370493255e --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/g_guanka_baoxiangshijaintiao.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e82886b3803c03549a97eb7d57d26177 +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: 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: 11f57d4c29a9dea4aa01c8620fdd44e3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index dea820a32f..0259a32c9e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -4918,7 +4918,7 @@ ParticleSystem: --- !u!199 &689865173 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11343,7 +11343,7 @@ ParticleSystem: --- !u!199 &53865032735354669 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16194,7 +16194,7 @@ ParticleSystem: --- !u!199 &53865032903479894 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20929,7 +20929,7 @@ ParticleSystem: --- !u!199 &53865033217178009 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25542,7 +25542,7 @@ ParticleSystem: --- !u!199 &53865033315684810 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -31039,7 +31039,7 @@ ParticleSystem: --- !u!199 &4590674014730051834 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -31626,7 +31626,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 217.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473222624206509369 @@ -31918,85 +31918,6 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 ---- !u!1 &1044086117782812440 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3801958242213401742} - - component: {fileID: 5318835811565835880} - - component: {fileID: 5857134916176845935} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3801958242213401742 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044086117782812440} - 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: 70693627459769760} - 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: 44, y: 0} - m_SizeDelta: {x: 364.13, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5318835811565835880 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044086117782812440} - m_CullTransparentMesh: 0 ---- !u!114 &5857134916176845935 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044086117782812440} - 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: 1, g: 0.8745099, b: 0.6, 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: 32 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 58 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 123:23:25 --- !u!1 &1046895504781953934 GameObject: m_ObjectHideFlags: 0 @@ -36811,7 +36732,7 @@ ParticleSystem: --- !u!199 &1081348591254749029 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41831,7 +41752,7 @@ ParticleSystem: --- !u!199 &1081348592704307586 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46608,7 +46529,7 @@ ParticleSystem: --- !u!199 &1081348592807160273 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -51311,7 +51232,7 @@ ParticleSystem: --- !u!199 &1081348593100259870 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56339,7 +56260,7 @@ ParticleSystem: --- !u!199 &5181674795885682804 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -60911,7 +60832,7 @@ ParticleSystem: --- !u!199 &345244862577150605 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -61268,7 +61189,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5551596210412472397 @@ -67666,7 +67587,7 @@ ParticleSystem: --- !u!199 &4461638917069206421 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -72822,7 +72743,7 @@ ParticleSystem: --- !u!199 &6978629692603714544 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -77924,7 +77845,7 @@ ParticleSystem: --- !u!199 &7894323138156412175 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -84463,7 +84384,7 @@ ParticleSystem: --- !u!199 &4571234231691897658 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90695,7 +90616,7 @@ ParticleSystem: --- !u!199 &6988990775388982249 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -91450,6 +91371,85 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &5627118751658014007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2945628706469497540} + - component: {fileID: 4863487749016447810} + - component: {fileID: 3356491940438429790} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2945628706469497540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5627118751658014007} + 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: 70693627459769760} + 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: 56.01, y: 0} + m_SizeDelta: {x: 340.12, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4863487749016447810 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5627118751658014007} + m_CullTransparentMesh: 0 +--- !u!114 &3356491940438429790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5627118751658014007} + 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: 1, g: 0.8745099, b: 0.6, 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: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 58 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 00:00 --- !u!1 &5632450942616631325 GameObject: m_ObjectHideFlags: 0 @@ -97781,7 +97781,7 @@ ParticleSystem: --- !u!199 &6133679773105218358 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -102675,7 +102675,7 @@ ParticleSystem: --- !u!199 &6133679773792227019 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -107341,7 +107341,7 @@ ParticleSystem: --- !u!199 &6133679774607836274 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -113980,7 +113980,7 @@ ParticleSystem: --- !u!199 &6532744217531708957 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -119016,7 +119016,7 @@ ParticleSystem: --- !u!199 &7511510412382184216 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -123959,7 +123959,7 @@ ParticleSystem: --- !u!199 &7511510412793165601 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -129300,7 +129300,7 @@ ParticleSystem: --- !u!199 &6340980222856265954 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -134068,7 +134068,7 @@ ParticleSystem: --- !u!199 &4325216380872068964 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -136274,7 +136274,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &70693627459769760 RectTransform: m_ObjectHideFlags: 0 @@ -136286,7 +136286,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3801958242213401742} + - {fileID: 2945628706469497540} m_Father: {fileID: 2931816858255176032} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -136323,7 +136323,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: 142358505d2906d4a8c0dad782d2e6fd, type: 3} + m_Sprite: {fileID: 21300000, guid: e82886b3803c03549a97eb7d57d26177, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 6258a38d46..e7e26efb5a 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1217,6 +1217,18 @@ function TimeToHMS(t) return string.format("%02d:%02d:%02d", _hour, _min, _sec), _hour, _min, _sec end +--- 将一段时间转换为时分 +function TimeToHM(t) + if not t or t < 0 then + return "00:00:00" + end + local _sec = t % 60 + local allMin = math.floor(t / 60) + local _min = allMin % 60 + local _hour = math.floor(allMin / 60) + return string.format("%02d:%02d", _hour, _min) +end + --- 将一段时间转换为分秒 function TimeToMS(t) if not t or t < 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua index 4833407bd1..8e14bec0d8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua @@ -28,6 +28,9 @@ function InvadeMonsterView:InitComponent(gameObject, fightPointPassMainPanel) --红点 this.expeditionRedPoint = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFastExplore/redPoint") this.rewardBoxRedPoint = Util.GetGameObject(self.gameObject, "Bg/getBoxReward/rewardBoxRedPoint") + this.rewardBoxTimeObj = Util.GetGameObject(this.rewardBox, "time") + this.rewardBoxTimeObj:SetActive(true) + this.rewardBoxTime = Util.GetGameObject(this.rewardBoxTimeObj, "Text"):GetComponent("Text") this.chapterRedPoint = Util.GetGameObject(self.gameObject, "Bg/btnGroup/btnRewrdChapter/redPoint") this.btnRewrdChapter = Util.GetGameObject(self.gameObject, "Bg/btnGroup/btnRewrdChapter") this.btnRewrdChapterText = Util.GetGameObject(self.gameObject, "Bg/btnGroup/btnRewrdChapter/Image/Text"):GetComponent("Text") @@ -115,7 +118,7 @@ end ----@param hangupTime 已经挂机时长 ---@return 0 -- 无奖励 1 -- 第一个奖励 2 -- 第二个奖励 3 -- 满奖励 没有奖励也显示这个该死的宝箱 function this.GetBoxShowState(hangupTime) - --Log("挂机时长 hangupTime " .. hangupTime) + Log("挂机时长 hangupTime " .. hangupTime) local state = 0 if hangupTime < AdventureManager.adventureRefresh then state = 0 @@ -128,6 +131,13 @@ function this.GetBoxShowState(hangupTime) end FightPointPassManager.SetBoxState(state) + if hangupTime > (AdventureManager.adventureOffline*3600) then + hangupTime = AdventureManager.adventureOffline*3600 + end + if hangupTime < 0 then + hangupTime = 0 + end + this.rewardBoxTime.text = TimeToHM(hangupTime) return state end From 1cf3f17888c6989b262a341bb90450074fcf3048 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 29 Dec 2020 14:23:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E7=A5=9E=E5=B0=86=E8=A7=A3=E9=94=81=E9=94=81=E5=AE=9A=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=9F=BA=E6=9C=AC=E7=9C=8B=E4=B8=8D=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=EF=BC=8C=E8=AE=A9=E5=85=B6=E6=9B=B4=E5=8A=A0=E6=98=8E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/r_tongyong_jiesuo.png | Bin 0 -> 18666 bytes .../ArtFont/r_tongyong_jiesuo.png.meta | 88 ++++++++++++++++++ .../ArtFont/r_tongyong_suoding.png | Bin 0 -> 17459 bytes .../ArtFont/r_tongyong_suoding.png.meta | 88 ++++++++++++++++++ .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 66 ++++++------- .../Modules/Bag/BagResolveAnCompoundPanel.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 2 +- 7 files changed, 211 insertions(+), 35 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_jiesuo.png create mode 100644 Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_jiesuo.png.meta create mode 100644 Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding.png create mode 100644 Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding.png.meta diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_jiesuo.png b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_jiesuo.png new file mode 100644 index 0000000000000000000000000000000000000000..e4e74a8a19e8b2230c812ccb3e0d7267426bbce6 GIT binary patch literal 18666 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 zbnX=compoundMaxNum and compoundMaxNum or compoundNum Log("compoundNum "..compoundNum) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index fe74fd8bb2..0313d6b70c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -83,7 +83,7 @@ function RoleInfoPanel:InitComponent() this.talismanInfo=Util.GetGameObject(self.transform,"option/talismanBtn/info") --查看法宝特性按钮 --上锁 - this.lockBtn=Util.GetGameObject(self.transform,"rolePanel/info/sartAndLvLayout/lockBtn") + this.lockBtn=Util.GetGameObject(this.optionUp,"lockBtn") this.lockImage=Util.GetGameObject(this.lockBtn.transform,"lock") this.unlockImage=Util.GetGameObject(this.lockBtn.transform,"unlock")