Merge branch 'china/dev' into 0活动开发聚集地/御剑行

dev_chengFeng
ZhangBiao 2021-10-14 18:28:55 +08:00
commit 4d911a4ea4
10 changed files with 262 additions and 70 deletions

View File

@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5450105837541760934
--- !u!1 &1912417221508703471
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -8,9 +8,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5119415483809533729}
- component: {fileID: 7220752045491615797}
- component: {fileID: 8298926714615160739}
- component: {fileID: 2854805868899816975}
- component: {fileID: 4508399484406381712}
- component: {fileID: 1739933010046783487}
m_Layer: 0
m_Name: shenjian_zuoqi
m_TagString: Untagged
@ -18,13 +18,13 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5119415483809533729
--- !u!224 &2854805868899816975
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5450105837541760934}
m_GameObject: {fileID: 1912417221508703471}
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}
@ -37,21 +37,21 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7220752045491615797
--- !u!222 &4508399484406381712
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5450105837541760934}
m_GameObject: {fileID: 1912417221508703471}
m_CullTransparentMesh: 0
--- !u!114 &8298926714615160739
--- !u!114 &1739933010046783487
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5450105837541760934}
m_GameObject: {fileID: 1912417221508703471}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
@ -69,7 +69,7 @@ MonoBehaviour:
initialSkinName: default
initialFlipX: 0
initialFlipY: 0
startingAnimation: idle3
startingAnimation: idle1
startingLoop: 1
timeScale: 1
freeze: 0

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 16c9d4969d0421146b4f3d835f540884
guid: 1fd6fc36fb891654e9481ed72bf10a7d
PrefabImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,100 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &213001277696820123
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4257325896593936961}
- component: {fileID: 1766069402006949971}
- component: {fileID: 590855203595466608}
- component: {fileID: 5855179253119392241}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4257325896593936961
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 213001277696820123}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.000045776367}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7546850210960475497}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -0.000030517578, y: -12.8}
m_SizeDelta: {x: 739, y: 2}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &1766069402006949971
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 213001277696820123}
m_CullTransparentMesh: 0
--- !u!114 &590855203595466608
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 213001277696820123}
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: 36e05fe912e1e9e47aef85f30fd11d93, 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!114 &5855179253119392241
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 213001277696820123}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &2310014580460002046
GameObject:
m_ObjectHideFlags: 0
@ -32,7 +127,7 @@ RectTransform:
m_Children:
- {fileID: 5268664344666227904}
m_Father: {fileID: 5601896589029272011}
m_RootOrder: 3
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -101,7 +196,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7546850210960475497
RectTransform:
m_ObjectHideFlags: 0
@ -110,16 +205,17 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3202280400653748793}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 200}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5601896589029272011}
m_LocalPosition: {x: 0, y: 0, z: 200.01599}
m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799}
m_Children:
- {fileID: 4257325896593936961}
m_Father: {fileID: 7723528773779627565}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 10, y: -137.5}
m_SizeDelta: {x: 672.1, y: 125}
m_AnchoredPosition: {x: -3762.0005, y: -491.5051}
m_SizeDelta: {x: 637.89, y: 83}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1489507525450056629
CanvasRenderer:
@ -142,7 +238,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.7254902, g: 0.6745098, b: 0.5921569, a: 1}
m_Color: {r: 0, g: 1, b: 0, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -150,7 +246,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
@ -161,8 +257,8 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.1
m_Text: "\\t\\t\\t\\t\\t\\tD48A07>\u5347\u7EA7</color>\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427<color=red>\u5427\u5566\n"
m_LineSpacing: 1.3
m_Text:
LanguageIndex: 0
--- !u!1 &4182431285272678155
GameObject:
@ -272,10 +368,10 @@ MonoBehaviour:
m_Top: 10
m_Bottom: 10
m_ChildAlignment: 3
m_Spacing: 10
m_Spacing: 25
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 1
--- !u!1 &4778057793701767630
GameObject:
@ -309,7 +405,7 @@ RectTransform:
m_Children:
- {fileID: 8634929813565441977}
m_Father: {fileID: 5601896589029272011}
m_RootOrder: 4
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -469,10 +565,10 @@ MonoBehaviour:
m_Top: 10
m_Bottom: 10
m_ChildAlignment: 3
m_Spacing: 10
m_Spacing: 25
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 1
--- !u!1 &6182841616647960639
GameObject:
@ -506,12 +602,10 @@ RectTransform:
m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799}
m_Children:
- {fileID: 7580864400587078201}
- {fileID: 2422870302914067564}
- {fileID: 7546850210960475497}
- {fileID: 5731873559918472345}
- {fileID: 419178286986730388}
m_Father: {fileID: 7723528773779627565}
m_RootOrder: 1
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -684,7 +778,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2422870302914067564
RectTransform:
m_ObjectHideFlags: 0
@ -693,16 +787,17 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6278409632359657520}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 200}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5601896589029272011}
m_LocalPosition: {x: 0, y: 0, z: 200.01599}
m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799}
m_Children:
- {fileID: 5290646498815670842}
m_Father: {fileID: 7723528773779627565}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 10, y: -94.5}
m_SizeDelta: {x: 108, y: 39}
m_AnchoredPosition: {x: -3762, y: -428}
m_SizeDelta: {x: 637.89, y: 127}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5840828537624518994
CanvasRenderer:
@ -725,7 +820,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.2784314, g: 0.5411765, b: 0.37254903, a: 1}
m_Color: {r: 0, g: 1, b: 0, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -733,7 +828,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
@ -744,8 +839,8 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.1
m_Text: "\u4E00\u9636\u6BB5"
m_LineSpacing: 1.3
m_Text:
LanguageIndex: 0
--- !u!1 &7397356887735718145
GameObject:
@ -925,6 +1020,8 @@ RectTransform:
m_LocalScale: {x: 0.9999203, y: 0.9999203, z: 0.9999203}
m_Children:
- {fileID: 7723611781473440887}
- {fileID: 2422870302914067564}
- {fileID: 7546850210960475497}
- {fileID: 5601896589029272011}
m_Father: {fileID: 0}
m_RootOrder: 0
@ -1171,3 +1268,98 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &9186487489877675353
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5290646498815670842}
- component: {fileID: 3664755432954548449}
- component: {fileID: 6990585686251927828}
- component: {fileID: 3806464512529235565}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5290646498815670842
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9186487489877675353}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.00012207031}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2422870302914067564}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: -12.8}
m_SizeDelta: {x: 739, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3664755432954548449
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9186487489877675353}
m_CullTransparentMesh: 0
--- !u!114 &6990585686251927828
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9186487489877675353}
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: 36e05fe912e1e9e47aef85f30fd11d93, 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!114 &3806464512529235565
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9186487489877675353}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1

View File

@ -4,24 +4,24 @@ size: 512,512
format: RGBA8888
filter: Linear,Linear
repeat: none
sj1
jian_idle1
rotate: false
xy: 2, 236
size: 374, 86
orig: 374, 86
offset: 0, 0
index: -1
jian_idle2
rotate: false
xy: 220, 2
size: 216, 232
orig: 216, 232
offset: 0, 0
index: -1
jian_idle3
rotate: false
xy: 2, 2
size: 109, 500
orig: 109, 500
offset: 0, 0
index: -1
sj2
rotate: false
xy: 280, 202
size: 165, 300
orig: 165, 300
offset: 0, 0
index: -1
sj3
rotate: false
xy: 113, 202
size: 165, 300
orig: 165, 300
size: 216, 232
orig: 216, 232
offset: 0, 0
index: -1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 KiB

After

Width:  |  Height:  |  Size: 163 KiB

View File

@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: b68d9c05dd10ec142b957aaeb574782d
spriteID: cf6110bf4d4075e4bbe3cf1c48748577
vertices: []
indices:
edges: []

View File

@ -1790,7 +1790,7 @@ Language = {
[11789] = GetLanguageStrById("需要神将等级达到"),
[11790] = GetLanguageStrById("材料不足无法觉醒!"),
[11791] = GetLanguageStrById("等级上限扩展到%s级"),
[11792] = GetLanguageStrById("星激活:"),
[11792] = GetLanguageStrById("星激活:\n"),
[11793] = GetLanguageStrById("觉醒前天赋"),
[11794] = GetLanguageStrById("觉醒后天赋"),
[11795] = GetLanguageStrById("阶激活:"),

View File

@ -839,7 +839,7 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i
-- 无视防御系数
ignoreDef = 1 - (ignoreDef or 0)
-- 基础伤害 = 攻击力 - 防御力
baseDamage = max(attack - BattleUtil.FP_Mul(0.5, defence, ignoreDef), 0)
baseDamage = max(attack - BattleUtil.FP_Mul(defence, ignoreDef), 0)
-- 基础伤害增加系数
local addDamageFactor = 1 + atkRole:GetRoleData(RoleDataName.DamageBocusFactor) - defRole:GetRoleData(RoleDataName.DamageReduceFactor)

View File

@ -14,9 +14,9 @@ function RoleTalentPopup:InitComponent()
self.BackMask = Util.GetGameObject(self.transform, "BackMask")
self.breakOpenSkill =Util.GetGameObject(self.transform, "bg/breakOpenSkill")
self.upStarOpenSkill =Util.GetGameObject(self.transform, "bg/upStarOpenSkill")
self.breakSkillTextPre =Util.GetGameObject(self.transform, "bg/breakSkillTextPre")
self.breakSkillTextPre =Util.GetGameObject(self.transform, "breakSkillTextPre")
self.breakOpenSkillGrid =Util.GetGameObject(self.transform, "bg/breakOpenSkill/Mask")
self.upStarSkillTextPre =Util.GetGameObject(self.transform, "bg/upStarSkillTextPre")
self.upStarSkillTextPre =Util.GetGameObject(self.transform, "upStarSkillTextPre")
self.upStarOpenSkill =Util.GetGameObject(self.transform, "bg/upStarOpenSkill/Mask")
end
@ -59,9 +59,9 @@ function RoleTalentPopup:GetTalentDataShow()
local curBreakId = OpenPassiveSkillRules[i][2]
if breakId >= curBreakId then
if breakSkillDataList[curBreakId] then
breakSkillDataList[curBreakId] = {index = curBreakId,str = breakSkillDataList[curBreakId].str .. "  <color=#66FF00>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
breakSkillDataList[curBreakId] = {index = curBreakId,str = breakSkillDataList[curBreakId].str .. "  <color=#00F800>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
else
breakSkillDataList[curBreakId] = {index = curBreakId,str ="<color=#66FF00>"..titleStr..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
breakSkillDataList[curBreakId] = {index = curBreakId,str ="<color=#00F800>"..titleStr..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
end
else
if breakSkillDataList[curBreakId] then
@ -77,13 +77,13 @@ function RoleTalentPopup:GetTalentDataShow()
local _passiveSkillId = passiveSkillConfig[OpenPassiveSkillRules[i][3]].Id
if upStarId >= curUpStarId then
if upStarSkillDataList[curUpStarId] then
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str = GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. "  <color=#66FF00>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str = GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. "<color=#00F800>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
else
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#66FF00>"..GetLanguageStrById(titleStr)..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#00F800>"..GetLanguageStrById(titleStr)..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
end
else
if upStarSkillDataList[curUpStarId] then
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. " <color=#B9AC97>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. "<color=#B9AC97>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
else
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#B9AC97>"..GetLanguageStrById(titleStr)..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
end