【本地化】错误修正,添加GM测试功能引导

dev_chengFeng
gaoxin 2021-01-28 11:42:05 +08:00
parent 0ed62b7032
commit 9816db8f36
10 changed files with 54 additions and 19 deletions

View File

@ -267,7 +267,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 441, y: -0.00001542648}
m_AnchoredPosition: {x: 441, y: -0.000025448759}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &764029605
@ -101770,11 +101770,6 @@ PrefabInstance:
propertyPath: m_Name
value: npc_en
objectReference: {fileID: 0}
- target: {fileID: 8984483763599071337, guid: e43faf9777d65b54982322f63b48e1e1,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5483075725301854260, guid: e43faf9777d65b54982322f63b48e1e1,
type: 3}
propertyPath: m_LocalPosition.x
@ -101895,6 +101890,12 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 0.58
objectReference: {fileID: 0}
- target: {fileID: 438777903418897483, guid: e43faf9777d65b54982322f63b48e1e1,
type: 3}
propertyPath: skeletonDataAsset
value:
objectReference: {fileID: 11400000, guid: 1636134f29078af4fb0c6f9d612716e6,
type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e43faf9777d65b54982322f63b48e1e1, type: 3}
--- !u!224 &6478355201032521874 stripped

View File

@ -21259,7 +21259,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2a501dedc77ccc74a954ef8709ada1d8, type: 3}
m_Sprite: {fileID: 21300000, guid: b90386ac10d6b074c964d66456a19290, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -42,9 +42,9 @@ function ExpeditionMainPanel:InitComponent()
self.Btn3 = Util.GetGameObject(self.parent, "lowGO/Btn3")
self.Btn4 = Util.GetGameObject(self.parent, "upLeftGo/Btn4")
self.Btn5 = Util.GetGameObject(self.parent, "lowGO/Btn5")
self.helpBtn = Util.GetGameObject(self.parent, "upLeftGo/helpBtn")
self.helpBtn = Util.GetGameObject(self.parent, "helpBtn")
self.redPoint = Util.GetGameObject(self.parent, "upLeftGo/Btn4/redPoint")
self.helpPos = Util.GetGameObject(self.parent, "upLeftGo/helpBtn"):GetComponent("RectTransform").localPosition
self.helpPos = Util.GetGameObject(self.parent, "helpBtn"):GetComponent("RectTransform").localPosition
self.titleImageText = Util.GetGameObject(self.parent, "titleImage/titleImage (1)"):GetComponent("Text")
self.timeTextGo = Util.GetGameObject(self.parent, "titleImage/timeText")
self.timeText = Util.GetGameObject(self.parent, "titleImage/timeText"):GetComponent("Text")

View File

@ -421,7 +421,8 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
local pro=Util.GetGameObject(o,"Pro/Image"):GetComponent("Image")
local starGrid=Util.GetGameObject(o,"StarGrid")
local name=Util.GetGameObject(o,"Name/Text"):GetComponent("Text")
local nameParent = Util.GetGameObject(o,"Name")
local name=Util.GetGameObject(nameParent,"Text"):GetComponent("Text")
-- local pos=Util.GetGameObject(o,"Pos"):GetComponent("Image")
local yuanImage=Util.GetGameObject(o,"yuanImage")

View File

@ -42,6 +42,15 @@ function this.OnFunctionOpen(funcId)
this.CheckFuncGuide()
end
-- 将引导加入引导队列
function this.TestFuncGuide(guideId)
if funcDic[guideId] then
funcDic[guideId] = nil
end
table.insert(_FuncGuideList, guideId)
this.CheckFuncGuide()
end
-- 初始化引导数据
function this.InitData(guideData)
openDic = {}

View File

@ -469,7 +469,7 @@ function this.ShowGuide(id)
end
if GuideConfig[id].Desc then
local str = GuideConfig[id].Desc
local str = GetLanguageStrById(GuideConfig[id].Desc)
str = string.gsub(str, "{", "<color=#FFEDA1FF>")
str = string.gsub(str, "}", "</color>")
this.desc.text = str

View File

@ -301,7 +301,6 @@ function this.OnReceiveServerList(str)
end
if str ~= nil and str ~= "" then
MyPCall(function()
LogError(str)
local json = require 'cjson'
local data = json.decode(str)

View File

@ -90,6 +90,8 @@ function GMPanel:InitComponent()
{type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[11194], inputTip = {Language[11195]}, callBack = this.TestJump},
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = Language[11176], inputTip = {Language[11196]}, callBack = nil},
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "24#%s", btnTip = Language[11197], inputTip = {Language[11198]}, callBack = nil},
{type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "功能引导测试", inputTip = {"请输入引导ID"}, callBack = this.TestFuncGuide},
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11199], inputTip = {""}, callBack = this.GoTestBattle},
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[11200], inputTip = {Language[11201]}, callBack = this.ChallengeMonster},
@ -224,6 +226,11 @@ end
function this.TestJump(text)
JumpManager.GoJump(tonumber(text))
end
-- 测试功能引导
function this.TestFuncGuide(text)
local gid = tonumber(text)
GuideManager.AddFuncGuide(gid)
end
-- 添加圣物
function this.AddHoly(text)
local command = "//addholy %s %s"

View File

@ -3,9 +3,11 @@ local OnlineRewardPanel = Inherit(BasePanel)
local this = OnlineRewardPanel
local itemPreList={} --item预设容器
local orginLayer = 0
local canGetList = {}
function OnlineRewardPanel:InitComponent()
this.closeBtn = Util.GetGameObject(this.gameObject,"show/btnBack")
this.getAll = Util.GetGameObject(this.gameObject,"show/btnGetAll")
this.preViewBtn = Util.GetGameObject(this.gameObject,"show/bg/preview")
this.light = Util.GetGameObject(this.gameObject,"light")
this.time = Util.GetGameObject(this.gameObject,"show/timeCount/time"):GetComponent("Text")
@ -56,10 +58,10 @@ function OnlineRewardPanel:OnShowActivityData()
local onlineRewardEffect = Util.GetGameObject(this.gameObject, "show/bg/Grid/RewardView"..i.."/root/ItemView/effects/UI_Effect_Kuang_JinSe")
local onlineRewardEffect2 = Util.GetGameObject(this.gameObject, "show/bg/Grid/RewardView"..i.."/root/ItemView/effects/UI_effect_WuCai_Kuang")
if(i<=ActivityGiftManager.currentTimeIndex)then--是否达到领奖时长
if(ActivityGiftManager.onlineGetRewardState[ActivityGiftManager.onlineData[i].Id]==0)then--奖励是否领取
this.getAll:SetActive(true)
this.closeBtn:SetActive(false)
if(redPoint)then
redPoint:SetActive(true)
end
@ -67,6 +69,8 @@ function OnlineRewardPanel:OnShowActivityData()
onlineRewardEffect:SetActive(true)
onlineRewardEffect2:SetActive(true)
table.insert(canGetList,i)
flag:SetActive(false)
Util.AddOnceClick(btn,function()
flag:SetActive(true)
@ -115,6 +119,17 @@ function OnlineRewardPanel:BindEvent()
Util.AddClick(this.closeBtn,function()
this:ClosePanel()
end)
Util.AddClick(this.getAll,function()
NetManager.GetActivityRewardRequest(-1, ActivityTypeDef.OnlineGift, function(_drop)
UIManager.OpenPanel(UIName.RewardItemPopup, _drop, 1,function()
for i = 1, #canGetList do
ActivityGiftManager.onlineGetRewardState[ActivityGiftManager.onlineData[canGetList[i]].Id] = 1
end
this.Refresh()
Game.GlobalEvent:DispatchEvent(GameEvent.OnlineGift.GetOnlineRewardSuccess)
end)
end)
end)
Util.AddClick(this.light,function()
this:ClosePanel()
end)
@ -129,7 +144,10 @@ function OnlineRewardPanel:RemoveListener()
end
function OnlineRewardPanel.Refresh()
canGetList={}
OnlineRewardPanel:showReward()
this.closeBtn:SetActive(#canGetList == 0)
this.getAll:SetActive(#canGetList > 0)
OnlineRewardPanel:RemainTimeDown()
end

View File

@ -29,9 +29,9 @@ function CreateNamePopup:InitComponent()
this.textName = Util.GetGameObject(self.gameObject,"Frame/InputField"):GetComponent("InputField")
this.btnRandName = Util.GetGameObject(self.gameObject, "Frame/randIcon")
this.card = Util.GetGameObject(self.gameObject, "Frame/card")
this.cardNum = Util.GetGameObject(self.gameObject, "Frame/card/num"):GetComponent("Text")
this.btnAddCard = Util.GetGameObject(self.gameObject, "Frame/card/add")
this.card = Util.GetGameObject(self.gameObject, "Frame/game/card")
this.cardNum = Util.GetGameObject(self.gameObject, "Frame/game/num"):GetComponent("Text")
this.btnAddCard = Util.GetGameObject(self.gameObject, "Frame/game/add")
this.mask = Util.GetGameObject(self.gameObject, "mask")
this.nameChangeRoot = Util.GetGameObject(self.gameObject, "Frame")