Merge branch 'main' of ssh://192.168.0.8:29418/XianJing into hy_en

Assets/Lua/UI/Common/TaskItemRefreshCtr.lua

@@ -15,7 +15,7 @@ function TaskItemRefreshCtr:SetData(wnd, itemLua, logicData, onClickOwner, onCli
     itemLua.ratio.gameObject:SetActive(not _state);
 
     itemLua.item.num.text.text = tostring(_itemData._cfgData.Active);
-    itemLua.taskName.text.text = _itemData._cfgData.TargetTaskDescribe;
+    itemLua.taskName.text.text = I18N.T(_itemData._cfgData.TargetTaskDescribe);
 
     itemLua.btnGoto.gameObject:SetActive(_getState == Enum.TaskState.NotGot and _canJump);
     itemLua.btnGet.gameObject:SetActive(_getState == Enum.TaskState.Got);

Assets/Lua/UI/UIActivity/UIActivityDailyRechargeBTView.lua

@@ -153,7 +153,7 @@ function UIActivityDailyRechargeBTView:GetItemByRowColumn(gridView, itemIndex, r
 	local item = gridView:NewListViewItem('TaskItemActivity')
 	local taskLua = CommonUtil.BindGridViewItem2Lua(self, 'TaskItemActivity', item.gameObject)
 
-	taskLua.taskName.text.text = taskData.name
+	taskLua.taskName.text.text = I18N.T(taskData.name)
 	taskLua.progress.scrollbar.size = taskData.progress and taskData.progress or (taskData.doNum / taskData.finishedNum)
 	taskLua.doNumTxt.text.text = taskData.doNum  .. "/" .. taskData.finishedNum
 	self:ShowTaskReward(taskLua,taskData:ShowRewards())

Assets/Lua/UI/UIActivity/UIActivityDailyRechargeROBTView.lua

@@ -180,7 +180,7 @@ function UIActivityDailyRechargeROBTView:GetItemByRowColumn(gridView, itemIndex,
 	local item = gridView:NewListViewItem('TaskItemActivity')
 	local taskLua = CommonUtil.BindGridViewItem2Lua(self, 'TaskItemActivity', item.gameObject)
 
-	taskLua.taskName.text.text = taskData.name
+	taskLua.taskName.text.text = I18N.T(taskData.name)
 	taskLua.progress.scrollbar.size = taskData.progress and taskData.progress or (taskData.doNum / taskData.finishedNum)
 	taskLua.doNumTxt.text.text = taskData.doNum  .. "/" .. taskData.finishedNum
 	self:ShowTaskReward(taskLua,taskData:ShowRewards())

Assets/Lua/UI/UIActivity/UIActivityKingTaskView.lua

@@ -192,7 +192,7 @@ function UIActivityKingTaskView:GetItemByRowColumn(gridView, itemIndex, row, col
 	--taskLua.num.text.text = itemIndex + 1
 	--LogError("==============  taskName = "..taskData.name)
 	--LogError("==============  taskNum = "..taskData.doNum)
-	taskLua.taskName.text.text = taskData.name
+	taskLua.taskName.text.text =  I18N.T(taskData.name)
 	taskLua.progress.scrollbar.size = taskData.progress and taskData.progress or (taskData.doNum / taskData.finishedNum)
 	taskLua.doNumTxt.text.text = taskData.doNum  .. "/" .. taskData.finishedNum
 	self:ShowTaskReward(taskLua,taskData:ShowRewards())

Assets/Lua/UI/UIRuneShop/UIRuneShopBuyTipsView.lua

@@ -34,7 +34,7 @@ function UIRuneShopBuyTipsView:Init()
 		CommonUtil.LoopGridViewEleCreateNew(self, self.goodsList.loopHorizontalScrollRect, nil, {}, 0, self, self.UpdateIconItem, nil, nil, 0)
 		return
 	end
-	self.textTitle.text.text = self.controller:GetGiftName()
+	self.textTitle.text.text = I18N.T(self.controller:GetGiftName())
 	if not self.controller:IsLimitNum() then
 		self.buyLimitTxt.text.text = ''
 	else