From 5f518babceaa444d22aabec751ed1ca1ca9f3a96 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 3 Nov 2020 14:18:02 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[=E7=81=B5=E5=85=BD]=E7=81=B5=E5=85=BD?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E9=A2=84=E8=A7=88=E6=8E=92=E5=BA=8F=20?= =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E5=86=8D=E6=9D=A5=E4=B8=80=E6=AC=A1=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Pokemon/PokemonSummonOneResultPanel.prefab | 8 ++++---- .../~Lua/Modules/Recruit/RecruitManager.lua | 11 ++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab index d8c502a19b..06c192d5c5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab @@ -34869,7 +34869,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 67, y: -123.7} + m_AnchoredPosition: {x: 67, y: -119.99999} m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2369707987322037555 @@ -35039,8 +35039,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: 0.000012398, y: -0.00002034} - m_SizeDelta: {x: 69, y: 100} + m_AnchoredPosition: {x: 0.77, y: -0.00002034} + m_SizeDelta: {x: 359.09, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3178489416745694411 CanvasRenderer: @@ -35081,7 +35081,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u518D\u6765\u4E00\u6B21" LanguageIndex: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index 060f35c6dd..d91b5f7094 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -141,10 +141,15 @@ function this.InitPreData() --判断品质 if itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity then --判断类型 - if itemConfig[a.Reward[1]].ItemType b.Reward[1] + if itemConfig[a.Reward[1]].ItemType==itemConfig[b.Reward[1]].ItemType then + --判断id + if a.Reward[1] == b.Reward[1] then + return a.Reward[2] < b.Reward[2] + else + return a.Reward[1] < b.Reward[1] + end else - return a.Reward[1] < b.Reward[1] + return itemConfig[a.Reward[1]].ItemType itemConfig[b.Reward[1]].Quantity From 9380675560b7ee77d2f926e7797d976079d07f20 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 3 Nov 2020 14:08:20 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E3=80=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=81=B5=E5=85=BD=E7=89=B9=E6=9D=83icon?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Icon/Item/r_privilege_yushou.png | Bin 0 -> 30626 bytes .../Icon/Item/r_privilege_yushou.png.meta | 88 ++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 Assets/ManagedResources/Icon/Item/r_privilege_yushou.png create mode 100644 Assets/ManagedResources/Icon/Item/r_privilege_yushou.png.meta diff --git a/Assets/ManagedResources/Icon/Item/r_privilege_yushou.png b/Assets/ManagedResources/Icon/Item/r_privilege_yushou.png new file mode 100644 index 0000000000000000000000000000000000000000..21a2cd8da9827a1e5f5f3e74358cc2e04e413b9b GIT binary patch literal 30626 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Icon/Item/r_privilege_yushou.png.meta b/Assets/ManagedResources/Icon/Item/r_privilege_yushou.png.meta new file mode 100644 index 0000000000..c57e2b20d7 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/r_privilege_yushou.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 217158c664bab4244be38e7491536b23 +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: -1 + 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: 95ce14e2db1acdb4fb8a2d9e52869541 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From f8b4befd3ce114694551e1f8411d9d1b42c76c6e Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 3 Nov 2020 14:17:33 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E3=80=91=20=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PokemonSummonOneResultPanel.prefab | 26 +------------------ .../Prefabs/UI/Resolve/ResolvePanel.prefab | 14 +++++----- 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab index d8c502a19b..adfed8134d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab @@ -35039,7 +35039,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.000012398, y: -0.00002034} + m_AnchoredPosition: {x: -7.2, y: 0.3} m_SizeDelta: {x: 69, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3178489416745694411 @@ -35169,7 +35169,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3569102849833951929} - - component: {fileID: 8233650449125365023} m_Layer: 5 m_Name: Content3 m_TagString: Untagged @@ -35199,26 +35198,3 @@ RectTransform: m_AnchoredPosition: {x: -1.9, y: 7} m_SizeDelta: {x: 255.2, y: 76.3} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8233650449125365023 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6974725393944192383} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index 85718c2ae5..408a4463dd 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -147,7 +147,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {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} @@ -395,7 +395,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6630273786794472594 RectTransform: m_ObjectHideFlags: 0 @@ -1752,7 +1752,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7950070701309201066 RectTransform: m_ObjectHideFlags: 0 @@ -6858,7 +6858,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: -469.6, y: 808.1} + m_AnchoredPosition: {x: -395, y: 808.1} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3424048373273667453 @@ -12180,7 +12180,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: 299, y: 462.5} + m_AnchoredPosition: {x: 299, y: 495} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5687762551274503171 @@ -13907,7 +13907,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {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} @@ -14134,7 +14134,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {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} From 5d6db87650d665a6a90312ecc66f7d4965d97c0d Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 3 Nov 2020 14:51:58 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E3=80=91=E5=8F=AC=E5=94=A4=E7=95=8C=E9=9D=A2=20?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab | 6 +++--- .../~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab index adfed8134d..83844f2d82 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab @@ -24470,11 +24470,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 44 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 - m_MaxSize: 45 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -35039,7 +35039,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: -7.2, y: 0.3} + m_AnchoredPosition: {x: -1.2, y: 0.3} m_SizeDelta: {x: 69, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3178489416745694411 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua index 9f18bd5ade..e36730ea5a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua @@ -111,7 +111,7 @@ function PokemonSummonOneResultPanel:OnOpen(...) if isFree then this.itemNum3.gameObject:SetActive(false) this.itemIcon3.gameObject:SetActive(false) - this.itemInfo3.text=Language[12399] + this.itemInfo3.text="免费召唤" this.tipText.gameObject:SetActive(false) else this.itemNum3.gameObject:SetActive(true) From 23717d6fc9b95203a9dc6811b17c705290e48d7f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 3 Nov 2020 14:20:10 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=9D=83=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=E7=89=B9=E6=9D=83=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E4=BC=9A=E5=B0=8F=E4=BA=8E0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=80=A5=E9=80=9F=E6=8E=A2?= =?UTF-8?q?=E7=B4=A2=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=89=A9=E4=BD=99=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E4=B8=BA=E8=B4=9F=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua index ce97f8867f..2fad4cceb6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua @@ -167,6 +167,10 @@ function PrivilegeManager.GetPrivilegeRemainValue(privilegeType) local usedTimes = this.GetPrivilegeUsedTimes(privilegeType) -- LogBlue(string.format("originalValue:%s, usedTimes:%s",tostring(originalValue),tostring(usedTimes))) local remainNum = originalValue - usedTimes + -- 剩余次数不会小于0,修正 + if remainNum < 0 then + remainNum = 0 + end return remainNum end From 49576b20ad132dbd7e66f9db4b73e206c66d98c5 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 3 Nov 2020 15:26:29 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=98=E6=96=97=E5=86=85=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=92=8C=E6=88=91=E6=96=B9=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/Unit/EnemyView.lua | 2 +- .../~Lua/Modules/Battle/View/Unit/PlayerView.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index c8c2a66684..10ab48d98e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -42,7 +42,7 @@ function EnemyView:onCreate(go, role, position, root) self.spAtkTime = RoleConfig[role.roleData.roleId].CastingSkills/1000 self.atkSoundTime = RoleConfig[role.roleData.roleId].CastingAudio/1000 self.attackSound = RoleConfig[role.roleData.roleId].sond - self.readingName = HeroConfig[role.roleData.roleId].readingName + self.readingName = HeroConfig[role.roleData.roleId].ReadingName -- self.nameText.text = self.readingName diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index 02ac1e639d..6a409f1a12 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -45,11 +45,11 @@ function PlayerView:onCreate(go, role, position, root) self.spAtkTime = RoleConfig[role.roleData.roleId].CastingSkills/1000 self.atkSoundTime = RoleConfig[role.roleData.roleId].CastingAudio/1000 self.attackSound = RoleConfig[role.roleData.roleId].sond - self.readingName = HeroConfig[role.roleData.roleId].readingName + self.readingName = HeroConfig[role.roleData.roleId].ReadingName self.nameText.text = self.readingName self.level.text = role:GetRoleData(RoleDataName.Level) - self.sprite = Util.LoadSprite(GetProStrImageByProNum(role.roleData.element)) + self.elementImg.sprite = Util.LoadSprite(GetProStrImageByProNum(role.roleData.element)) self.bg1.sprite = Util.LoadSprite(GetBattleHeroCardStarBg[role.roleData.star]) self.bg2.sprite = Util.LoadSprite(GetHeroCardStarFg[role.roleData.star]) local starGrid = Util.GetGameObject(go, "StarGrid") From 0a8498b95ef94d97fe1177f8d91dce62715484d9 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 3 Nov 2020 16:08:10 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E3=80=91=20=E5=8F=AC=E5=94=A4=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=87=E5=AD=97=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Pokemon/PokemonSummonPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua index dafaf6d4ea..f6e64841ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua @@ -129,7 +129,7 @@ function PokemonSummonPanel:refreshBtnShow() end local d = RecruitManager.GetExpendData(type) if isFree then - info.text=Language[11759] + info.text=" "..Language[11759] else itemId = d[1] itemNum = d[2] From 0918acadd4bf02debac7ee55eb93f2e479839dd8 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 3 Nov 2020 16:10:45 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E3=80=91=20=E7=BE=81=E7=BB=8A=E9=A2=84=E8=AE=BE?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab index 0216a3a365..028e5fbd8c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab @@ -3768,7 +3768,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4009861031449356928} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: