diff --git a/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Shang.prefab b/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Shang.prefab
index c15402c59b..d0348cc3d1 100644
--- a/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Shang.prefab
+++ b/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Shang.prefab
@@ -1,5 +1,100 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1255744913604275776
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8521973267585591922}
+ - component: {fileID: 7794853946359841142}
+ - component: {fileID: 6038113292212032509}
+ - component: {fileID: 5506195154577791131}
+ m_Layer: 5
+ m_Name: MingZi2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8521973267585591922
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1255744913604275776}
+ 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: 6210025964722972635}
+ m_RootOrder: 7
+ 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: -237, y: 247}
+ m_SizeDelta: {x: 512, y: 512}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7794853946359841142
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1255744913604275776}
+ m_CullTransparentMesh: 0
+--- !u!114 &6038113292212032509
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1255744913604275776}
+ 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: 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: be22547d075a3fa439f78ce38cdb4beb, type: 3}
+ m_FontSize: 110
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 110
+ m_Alignment: 1
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text:
+--- !u!114 &5506195154577791131
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1255744913604275776}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0.45882356, g: 0.08235294, b: 0.09411766, a: 1}
+ m_EffectDistance: {x: 3, y: -3}
+ m_UseGraphicAlpha: 1
--- !u!1 &6210025962759935903
GameObject:
m_ObjectHideFlags: 0
@@ -19495,7 +19590,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &6210025963956660393
RectTransform:
m_ObjectHideFlags: 0
@@ -43273,6 +43368,7 @@ RectTransform:
- {fileID: 6210025963826662128}
- {fileID: 6210025963079100106}
- {fileID: 6210025963956660393}
+ - {fileID: 8521973267585591922}
m_Father: {fileID: 6210025964156221442}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Xia.prefab b/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Xia.prefab
index 3dbb303fd6..cd1a8a39f1 100644
--- a/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Xia.prefab
+++ b/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Xia.prefab
@@ -9510,6 +9510,101 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1672364269597192357
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3455075248093122093}
+ - component: {fileID: 6786769470501470680}
+ - component: {fileID: 2151592676786695955}
+ - component: {fileID: 8407727542845807339}
+ m_Layer: 5
+ m_Name: MingZi2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3455075248093122093
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1672364269597192357}
+ 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: 348810894747206553}
+ m_RootOrder: 7
+ 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: 296, y: -688}
+ m_SizeDelta: {x: 380, y: 252}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6786769470501470680
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1672364269597192357}
+ m_CullTransparentMesh: 0
+--- !u!114 &2151592676786695955
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1672364269597192357}
+ 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: 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: be22547d075a3fa439f78ce38cdb4beb, type: 3}
+ m_FontSize: 110
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 120
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text:
+--- !u!114 &8407727542845807339
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1672364269597192357}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0.45882356, g: 0.08235294, b: 0.09411766, a: 1}
+ m_EffectDistance: {x: 3, y: -3}
+ m_UseGraphicAlpha: 1
--- !u!1 &1692657386834786293
GameObject:
m_ObjectHideFlags: 0
@@ -37870,6 +37965,7 @@ RectTransform:
- {fileID: 7175417117984489146}
- {fileID: 6178244567141508744}
- {fileID: 8054458067301812853}
+ - {fileID: 3455075248093122093}
m_Father: {fileID: 2062855263842464721}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -42934,7 +43030,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &8054458067301812853
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
index edd732ca95..f1f8c7c70f 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
@@ -28,7 +28,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId)
self.enemysId=enemyId --剧情id,用于处理剧情特殊显示
-- 创建技能播放器
self.castingEfectNode = self.RootPanel.enemySkillCast
- self.castingNameNode = Util.GetGameObject(self.castingEfectNode, "TongYong_Casting_Shang/DongHua/MingZi")
+ self.castingNameNode = Util.GetGameObject(self.castingEfectNode, "TongYong_Casting_Shang/DongHua/MingZi2")
self.hpSlider = Util.GetGameObject(go, "hpProgress/hp"):GetComponent("Image")
self.hpPassSlider = Util.GetGameObject(go, "hpProgress/hpPass"):GetComponent("Image")
self.yujiaSlider=Util.GetGameObject(go, "hpProgress/yujia"):GetComponent("Image")
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua
index b288fdff74..1354ca26ac 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua
@@ -52,8 +52,8 @@ function MonsterView:onCreate(go, role, position, root)
self.livePath = GetResourcePath(self.config.Live)
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(self.config.Icon))
else
- --self.GameObject:SetActive(false)
- --self.icon.gameObject:SetActive(false)
+ -- self.GameObject:SetActive(false)
+ -- self.icon.gameObject:SetActive(false)
end
self.play_liveScale = self.config.play_liveScale
@@ -277,7 +277,12 @@ function MonsterView:OnSkillCastingStart(skill)
--self.RoleLiveGO2.transform:DORotate(Vector3.New(0, 90, 0),0.5):OnComplete(function()
--self.RoleLiveGO2.gameObject:SetActive(false)
- self.RoleLiveGO3.gameObject:SetActive(true)
+ if self.isMainPlayer then
+ self.RoleLiveGO3.gameObject:SetActive(false)
+ else
+ self.RoleLiveGO3.gameObject:SetActive(true)
+ end
+
if (self.camp==0 and heroConfig and heroConfig.Toward==1) or (self.camp==1 and heroConfig and heroConfig.Toward==2) then
self.RoleLiveGO3.transform:DORotate(Vector3.New(0,180, 0),0.5)
else
@@ -300,7 +305,12 @@ function MonsterView:OnSkillCastingStart(skill)
-- 延长Casting时间
return 0.6
else
- self.RoleLiveGO2:SetActive(true)
+ if self.isMainPlayer then
+ self.RoleLiveGO2:SetActive(false)
+ else
+ self.RoleLiveGO2:SetActive(true)
+ end
+
if self.isMainPlayer then
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "idle" , false)
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
index d058dd133a..c387b78b34 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
@@ -27,7 +27,7 @@ function PlayerView:onCreate(go, role, position, root)
self.camp = role.camp
self.spLoader = SpriteLoader.New()
self.castingEfectNode = self.RootPanel.mySkillCast
- self.castingNameNode = Util.GetGameObject(self.castingEfectNode, "TongYong_Casting_Xia/DongHua/MingZi")
+ self.castingNameNode = Util.GetGameObject(self.castingEfectNode, "TongYong_Casting_Xia/DongHua/MingZi2")
self.hpSlider = Util.GetGameObject(go, "lvObj/hpProgress/hp"):GetComponent("Image")
self.hpPassSlider = Util.GetGameObject(go, "lvObj/hpProgress/hpPass"):GetComponent("Image")
self.yujiaSlider=Util.GetGameObject(go, "lvObj/hpProgress/yujia"):GetComponent("Image")
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
index 344fa4097e..40cf9fb38c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
@@ -86,7 +86,7 @@ function RoleView:onCreate(go, role, position, root)
-- 创建技能播放器
self.nameObj=Util.GetGameObject(go, "GameObject")
local castingEfectNode = self.role.camp == 0 and self.RootPanel.mySkillCast or self.RootPanel.enemySkillCast
- local castingNameNode = Util.GetGameObject(castingEfectNode, self.role.camp == 0 and "TongYong_Casting_Xia/DongHua/MingZi" or "TongYong_Casting_Shang/DongHua/MingZi")
+ local castingNameNode = Util.GetGameObject(castingEfectNode, self.role.camp == 0 and "TongYong_Casting_Xia/DongHua/MingZi2" or "TongYong_Casting_Shang/DongHua/MingZi2")
self.SkillCaster = SkillCaster.New(self, self.spAtkTime, self.atkSoundTime, self.attackSound, castingEfectNode, castingNameNode)
-- 卡牌立绘
diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua
index 6f8b752fe0..24e073d69e 100644
--- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua
@@ -6,6 +6,8 @@ local redPointList = {}
local tabsRedpoints = {}
local tabs={}
local tabsImg = {"r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh"}
+local special=ConfigManager.GetConfigData(ConfigName.SpecialConfig,177)
+local pro=tonumber(special.Value)/100
-- Tab管理器
local TabBox = require("Modules/Common/TabBox")
local tabData = {
@@ -25,6 +27,7 @@ local tabData = {
local curData = {}
local curPage = 1
local proId = 1
+local addLv=0
--初始化组件(用于子类重写)
function TailsManSouPanel:InitComponent()
this.spLoader = SpriteLoader.New()
@@ -82,14 +85,15 @@ function TailsManSouPanel:BindEvent()
end)
Util.AddClick(self.addBtn, function()
local li = TailsManSoulManager.GetTailsmanTotalPro()
+ local li2= TailsManSoulManager.GetTailsmanTotalProNoAdd()
if not li or #li < 1 then
PopupTipPanel.ShowTip("当前无属性加成")
return
end
- local s = function(data)
+ local s = function(data,data2)
local lis1 = {}
for k,v in pairs(data) do
- table.insert(lis1,{str = string.format("%s+%s",propertyConfig[k].Info,GetPropertyFormatStr(propertyConfig[k].Style,v)),sort = propertyConfig[k].SortId})
+ table.insert(lis1,{str = string.format("%s+%s 法宝共鸣额外加成%s (%s%%)",propertyConfig[k].Info,GetPropertyFormatStr(propertyConfig[k].Style,v),GetPropertyFormatStr(propertyConfig[k].Style,v-data2[k]),addLv*pro),sort = propertyConfig[k].SortId})
end
table.sort(lis1,function(a,b)
return a.sort < b.sort
@@ -103,7 +107,7 @@ function TailsManSouPanel:BindEvent()
local data = {}
local singData = {}
singData.title = "加成属性"
- singData.pro = s(li)
+ singData.pro = s(li,li2)
singData.tip = ""
table.insert(data,singData)
-- for i = 1 ,#data do
@@ -112,7 +116,7 @@ function TailsManSouPanel:BindEvent()
-- LogGreen("data[i]:"..v)
-- end
-- end
- UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.IncarnationDes,data)
+ UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.IncarnationDes2,data)
-- local li = TailsManSoulManager.GetTailsmanTotalPro()
-- local li2 = {}
@@ -238,6 +242,17 @@ function TailsManSouPanel:OnShow()
--self.tabBox:Init(self.tabbox.gameObject, tabs, curPage)
curData = TailsManSoulManager.GetTailsmanSoulDatasByPro(1)
self:RefreshData()
+ addLv=0
+ for i=1,5 do
+ local curData = TailsManSoulManager.GetTailsmanSoulDatasByPro(i)
+ for j=1,#curData do
+ --LogError("curData.lv=========="..curData[j].lv)
+ if curData[j].lv>0 then
+ addLv=addLv+curData[j].lv
+ end
+
+ end
+ end
self.effectJin.gameObject:SetActive(tabData[curPage].quality == 5)
self.effectHong.gameObject:SetActive(tabData[curPage].quality == 6)
Util.SetParticleSortLayer(self.effectJin.gameObject,self.sortingOrder + 1)