diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index ab862bc313..7ac8e4d51d 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1672,7 +1672,7 @@ [11671] = "点击任意卡牌,向神明祈福吧!本次祈福消耗", [11672] = "活动不可刷新", [11673] = "当前时间不可刷新", - [11674] = "本轮祈福还未全部结束,刷新后会重置祈福次数与累计奖励,确认刷新祈福奖励吗?", + [11674] = "本轮祈福还未全部结束,确认刷新祈福奖励吗?", [11675] = "%d年%d月%d日", [11676] = "恭喜你完成了第 ", [11677] = " 次祈福!", @@ -2364,8 +2364,8 @@ [12363] = "即可激活30天月卡", [12364] = "是否消耗%s%s购买一次挑战次数?", [12365] = "天宫秘宝", - [12366] = "解锁秘宝,可以领取额外专属奖励,并直接获得200积分,可获取1980妖晶,邮件领取", - [12367] = "解锁高阶战令,激活进阶专属奖励+直升15级,可获取1980妖晶,邮件领取", + [12366] = "解锁秘宝,可以领取额外专属奖励,并直接获得200积分,可获取1980妖晶,邮件领取", + [12367] = "解锁秘宝,激活进阶专属奖励+直升15级,可获取1980妖晶,邮件领取", [12368] = "等级购买成功", [12369] = "购买%s级,升至%s级", [12370] = "升至%s级,可立即解锁%s件奖励", diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua index a0274e8286..2db831cd6b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua @@ -18,7 +18,8 @@ function this.Init(root,...) end --- 获取需要显示的编队id function this.GetFormationIndex() - return this.teamId and this.teamId or FormationManager.curFormationIndex + return FormationTypeDef.FORMATION_NORMAL + -- this.teamId and this.teamId or FormationManager.curFormationIndex end --- 关闭界面事件 diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 7c3302b74c..4686b6d99f 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -1671,7 +1671,7 @@ 11671,⿨ƣɣ 11672,ˢ 11673,ǰʱ䲻ˢ -11674,δȫˢºۼƽȷˢ +11674,δȫȷˢ 11675,%d%d%d 11676,ϲ˵ 11677, @@ -1878,7 +1878,7 @@ 11878,DZid 11879, 11880,߲㣡 -11881,1Ԫ20û +11881,1Ԫ 11882,1 11883, 11884,10Ԫ @@ -2363,8 +2363,8 @@ 12363,30¿ 12364,Ƿ%s%sһս 12365,칬ر -12366,رȡרֱӻ200 -12367,߽սר+ֱ15 +12366,رȡרֱӻ200֣ɻȡ1980ʼȡ +12367,رר+ֱ15ɻȡ1980ʼȡ 12368,ȼɹ 12369,%s%s 12370,%s%s @@ -2385,3 +2385,4 @@ 12385,dzɳ 12386, 12387,Ÿ +12388,۷ս