ybx_Gdn 10 месяцев назад
Родитель
Сommit
9ee2a89622

+ 77 - 76
Assets/Content/Config/LanguagePackage_cn.csv

@@ -18871,79 +18871,80 @@ UiFULCfg_LD_15,We can cultivate pets and dispatch them to accompany their owners
 ICfg_Describe_15120,Open for selection Mvp Top tier card bag
 ICfg_Name_15120,Mvp Top optional card bag
 ShopCfg_GoodsName_10009,Filled Chocolates
-ShaiXuan,篩選
-DaKai,打開
-DengLu,登录
-Zengsong,贈送
-ClickClose,点击空白处關闭
-PaiMing,排名
-LSZG,歷史最高
-DiNGuan,第{0}関
-Tgbgkhd,通过本關可获得
-Dqjf,當前積分
-JnSjCg,技能升級成功
-Qwjnym,前往技能頁面
-GxdPh,贡献点排行
-NhmJrgh,你还没有加入任何公會
-DqMyGhSb,当前没有任何公會上榜
-Chengyuan,成員
-BoLiSCTxt,提高波利商城等級可以獲得更多禮包和特權
-BsjXd,本赛季限定!
-LsSl,历史胜率:
-SjJf,赛季积分
-JrSyTzCs,今日剩余挑戰次数:
-ShenWei,神威
-TzhRzh,挑戰日志
-DaShKz,大师馈赠
-TZhJlYn,挑戰奖励预览
-KaiQi,開启
-HmWjTzh,还没有玩家参与挑戰~
-TiaoZhRizhi,挑戰日志
-ZchSh,造成傷害
-ShHZg,傷害最高
-QyEwYjJl,全員額外郵件獎勵
-HudjoCfg_Name_2,特級道場
-HudjoCfg_Name_31,二級道場
-HudjoCfg_Name_11,一級道場
-HudjoCfg_Name_82,四級道場
-HudjoCfg_Name_1,頂級道場
-HudjoCfg_Name_62,三級道場
-HudjoCfg_Name_5,寶箱道場
-RobotCfg_RobotName_1608,才華子木哥哥
-RobotCfg_RobotName_1142,李笑龍
-RobotCfg_RobotName_1349,劉貝
-RobotCfg_RobotName_1656,狼王顧潔
-RobotCfg_RobotName_1094,張三瘋
-RobotCfg_RobotName_20006,寒彩英
-RobotCfg_RobotName_10004,三級道場守衞
-RobotCfg_RobotName_1494,悽慘大哥哥
-RobotCfg_RobotName_1446,張菲
-RobotCfg_RobotName_20003,羊王苟或
-RobotCfg_RobotName_10005,四級道場守衞
-RobotCfg_RobotName_20009,天天澆花
-RobotCfg_RobotName_20007,巔峯小魔女
-RobotCfg_RobotName_10003,二級道場守衞
-RobotCfg_RobotName_20008,美麗小金
-RobotCfg_RobotName_20010,卡普拉職員
-RobotCfg_RobotName_20005,黑屋
-RobotCfg_RobotName_20004,卡普拉女秘書
-RobotCfg_RobotName_20002,巔峯大魔頭
-RobotCfg_RobotName_20001,卡普拉小姐姐
-RobotCfg_RobotName_10002,一級道場守衞
-RobotCfg_RobotName_10001,特級道場守衞
-RobotCfg_RobotName_10000,頂級道場守衞
-ExpeditionCfg_Name_5001,德雷克海峽
-ExpeditionCfg_UnlockDesc_5001,通關阿塔聖殿以後解鎖
-ExpeditionCfg_Name_4001,阿塔聖殿
-ExpeditionCfg_UnlockDesc_4001,通關生命研究所以後解鎖
-ExpeditionCfg_Name_2001,沙漠之都
-ExpeditionCfg_UnlockDesc_2001,通關潭陽竹海以後解鎖
-ExpeditionCfg_Name_7001,迷霧山脈
-ExpeditionCfg_UnlockDesc_7001,通關秘銀河谷以後解鎖
-ExpeditionCfg_Name_8001,艾爾帕蘭
-ExpeditionCfg_UnlockDesc_8001,通關迷霧山脈以後解鎖
-ExpeditionCfg_Name_1001,潭陽竹海
-ExpeditionCfg_Name_6001,秘銀河谷
-ExpeditionCfg_UnlockDesc_6001,通關德雷克海峽以後解鎖
-ExpeditionCfg_Name_3001,生命研究所
-ExpeditionCfg_UnlockDesc_3001,通關沙漠之都以後解鎖
+ShaiXuan,filter
+DaKai,open
+DengLu,log on
+Zengsong,gift
+ClickClose,Click on the blank space to close
+PaiMing,ranking
+LSZG,The highest in history
+DiNGuan,Level{0}
+Tgbgkhd,"By completing this level, you can obtain"
+Dqjf,Current points
+JnSjCg,Skill upgrade successful
+Qwjnym,Go to the skills page
+GxdPh,Contribution Point Ranking
+NhmJrgh,You haven't joined any guild yet
+DqMyGhSb,There are currently no guilds on the list
+Chengyuan,member
+BoLiSCTxt,Raising the level of Poli Mall can earn more gift packages and privileges
+BsjXd,This season is limited!
+LsSl,Historical winning rate:
+SjJf,Season points
+JrSyTzCs,Today's remaining challenge times:
+ShenWei,Kamui
+TzhRzh,Challenge Log
+DaShKz,Gift from Master
+TZhJlYn,Challenge Reward Preview
+KaiQi,Open it
+HmWjTzh,No players have participated in the challenge yet~
+TiaoZhRizhi,Challenge Log
+ZchSh,Causing harm
+ShHZg,The highest damage
+QyEwYjJl,Additional email rewards for all employees
+HudjoCfg_Name_2,Premium Dojo
+HudjoCfg_Name_31,Secondary dojo
+HudjoCfg_Name_11,First  dojo
+HudjoCfg_Name_82,Fourth level Dojo
+HudjoCfg_Name_1,Top Dojo
+HudjoCfg_Name_62,Third level dojo
+HudjoCfg_Name_5,Treasure Box Dojo
+RobotCfg_RobotName_1608,"Cai Huazi, Brother Mu"
+RobotCfg_RobotName_1142,Li Xiaolong
+RobotCfg_RobotName_1349,Liu Bei
+RobotCfg_RobotName_1656,Wolf King Gu Jie
+RobotCfg_RobotName_1094,Zhang Sanfang
+RobotCfg_RobotName_20006,Han Caiying
+RobotCfg_RobotName_10004,Third level dojo guardian
+RobotCfg_RobotName_1494,Sad big brother
+RobotCfg_RobotName_1446,Zhang Fei
+RobotCfg_RobotName_20003,Sheep King Gou or
+RobotCfg_RobotName_10005,Fourth level Dojo Guard
+RobotCfg_RobotName_20009,Watering flowers every day
+RobotCfg_RobotName_20007,Top Peak Little Witch
+RobotCfg_RobotName_10003,Secondary dojo guardian
+RobotCfg_RobotName_20008,Beautiful Little Gold
+RobotCfg_RobotName_20010,Capra staff
+RobotCfg_RobotName_20005,black room
+RobotCfg_RobotName_20004,Capra Female Secretary
+RobotCfg_RobotName_20002,Top Peak Demon Head
+RobotCfg_RobotName_20001,Sister Capra
+RobotCfg_RobotName_10002,First level dojo guardian
+RobotCfg_RobotName_10001,Special grade dojo guardian
+RobotCfg_RobotName_10000,Top dojo guards
+ExpeditionCfg_Name_5001,Drake Passage
+ExpeditionCfg_UnlockDesc_5001,Unlock after clearing Ata Temple
+ExpeditionCfg_Name_4001,Ata Temple
+ExpeditionCfg_UnlockDesc_4001,Unlock after completing the Life Research Institute
+ExpeditionCfg_Name_2001,The capital of the desert
+ExpeditionCfg_UnlockDesc_2001,Unlock after clearing Tanyang Bamboo Sea
+ExpeditionCfg_Name_7001,Misty Mountains
+ExpeditionCfg_UnlockDesc_7001,Unlock after clearing the Secret Silver Valley
+ExpeditionCfg_Name_8001,El Palan
+ExpeditionCfg_UnlockDesc_8001,Unlock after clearing the Misty Mountains
+ExpeditionCfg_Name_1001,Tanyang Bamboo Sea
+ExpeditionCfg_Name_6001,Secret Silver Valley
+ExpeditionCfg_UnlockDesc_6001,Unlock after clearing the Drake Passage
+ExpeditionCfg_Name_3001,Life Research Institute
+ExpeditionCfg_UnlockDesc_3001,Unlock after clearing the Desert City
+JianghuoDe,將获得

+ 14 - 0
Assets/Content/Prefabs/UI/UITips/UITips.prefab

@@ -10533,6 +10533,7 @@ GameObject:
   - component: {fileID: 7739010434314276151}
   - component: {fileID: 2414574618608691460}
   - component: {fileID: 4720167542916312045}
+  - component: {fileID: 8077647821004209425}
   m_Layer: 5
   m_Name: txt
   m_TagString: Untagged
@@ -10602,6 +10603,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5C07\u83B7\u5F97"
+--- !u!114 &8077647821004209425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5514916323396668851}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: JianghuoDe
 --- !u!1 &5515067307460718703
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Lua/UI/UIMain/UIMainView.lua

@@ -327,7 +327,7 @@ function UIMainView:RefreshSeasonInfo()
 	end
 
 	self.SeasonName.text.text = I18N.T(competitionCfgDatas[1].CompetitionName)
-
+	self.SeasonName1.text.text = I18N.T(competitionCfgDatas[1].CompetitionName)
 	if stage == 1 then
 		self.remainDay.text.text = I18N.T("DscSeasonResult13")
 		self.remainDay1.text.text = I18N.T("DscSeasonResult13")

+ 6 - 4
Assets/Lua/Util/CommonUtil.lua

@@ -2416,10 +2416,12 @@ function SetPlayerHeadAndFrame(pageTbl,headNode,actorData,smallFrame, headFrame,
         end,headNode, "PlayerHeadFrameIdx")
     else
         local frameIcon = Constant.Quality_White_Head_Frame_Icon
-        if actorData.StrengthLevel == 100 then
-            frameIcon = Constant.Quality_HeadFrame_Lead_Icon
-        elseif actorData.StrengthLevel > 0 then
-            frameIcon = Constant.Quality_HeadFrame_Icons[math.min(actorData.StrengthLevel, #Constant.Quality_HeadFrame_Icons)]
+        if actorData.StrengthLevel ~= nil then
+            if actorData.StrengthLevel == 100 then
+                frameIcon = Constant.Quality_HeadFrame_Lead_Icon
+            elseif actorData.StrengthLevel > 0 then
+                frameIcon = Constant.Quality_HeadFrame_Icons[math.min(actorData.StrengthLevel, #Constant.Quality_HeadFrame_Icons)]
+            end
         end
         if replaceParams ~= nil and replaceParams.StrengthLevel ~= nil then
             frameIcon = Constant.Quality_White_Head_Frame_Icon