xiyou_sanguo
parent
f8c108c523
commit
d5f0f059a2
|
|
@ -1275,6 +1275,8 @@ JumpType = {
|
|||
Explor = 123, --探索
|
||||
HomeLand = 124, --家园
|
||||
GodsWay = 125, --封神之路 多对塔
|
||||
GodsWayTower_1 = 139, --封神之路 多对塔1
|
||||
GodsWayTower_2 = 140, --封神之路 多对塔2
|
||||
BuyVigor = 10000, --体力购买
|
||||
BuyGold = 10001, --金币购买
|
||||
Privilege = 10003, -- 特权
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ function InitLanguageData()
|
|||
if config.original then
|
||||
languageDic[config.original] = {}
|
||||
languageDic[config.original].zh = config.original
|
||||
languageDic[config.original].en = config.english or config.original
|
||||
languageDic[config.original].vi = config.vietnamese or config.original
|
||||
languageDic[config.original].thai = config.Thailand or config.original
|
||||
languageDic[config.original].en = config.original or config.original
|
||||
languageDic[config.original].vi = config.original or config.original
|
||||
languageDic[config.original].thai = config.original or config.original
|
||||
count = count + 1
|
||||
end
|
||||
end
|
||||
|
|
@ -27,11 +27,11 @@ function GetTranslateSpriteName(name)
|
|||
if subStr == "_zh" then
|
||||
local l = GetCurLanguage()
|
||||
if l == 1 then
|
||||
transName = string.sub(transName, 1, #transName - 2) .. "en"
|
||||
transName = string.sub(transName, 1, #transName - 2) .. "zh"
|
||||
elseif l == 0 then
|
||||
transName = string.sub(transName, 1, #transName - 2) .. "zh"
|
||||
else
|
||||
transName = string.sub(transName, 1, #transName - 2) .. "en"
|
||||
transName = string.sub(transName, 1, #transName - 2) .. "zh"
|
||||
end
|
||||
end
|
||||
--LogError(transName)
|
||||
|
|
|
|||
|
|
@ -2648,11 +2648,12 @@ end
|
|||
|
||||
-- 0:中文 1:英文
|
||||
function GetCurLanguage()
|
||||
if PlayerPrefs.HasKey("language") then
|
||||
return PlayerPrefs.GetInt("language")
|
||||
else
|
||||
return 0
|
||||
end
|
||||
return 0
|
||||
--if PlayerPrefs.HasKey("language") then
|
||||
--return PlayerPrefs.GetInt("language")
|
||||
--else
|
||||
--return 0
|
||||
--end
|
||||
end
|
||||
|
||||
-- 文字大小比例缩放
|
||||
|
|
|
|||
|
|
@ -313,7 +313,7 @@ function this:SetItemData(_itemDatas, isTop, isNotAni)
|
|||
local v2 = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
|
||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,
|
||||
Util.GetGameObject(self.transform, "scroll").transform,
|
||||
this.ItemView, this.Scrollbar, Vector2.New(-v2.x * 2, -v2.y * 2), 1, 5, Vector2.New(40, 11))
|
||||
this.ItemView, this.Scrollbar, Vector2.New(-v2.x * 2, -v2.y * 2), 1, 4, Vector2.New(70, 12))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 2
|
||||
end
|
||||
|
|
@ -387,7 +387,7 @@ function this.SingleItemDataShow(_go, _itemData)
|
|||
|
||||
local str = ""
|
||||
if GetCurLanguage() == 0 and LengthString(GetLanguageStrById(_itemData.itemConfig.Name)) > 6 then
|
||||
str = SubString(GetLanguageStrById(_itemData.itemConfig.Name), 8) .. "..."
|
||||
str = SubString(GetLanguageStrById(_itemData.itemConfig.Name), 6) .. "..."
|
||||
elseif GetCurLanguage() == 1 and LengthString(GetLanguageStrById(_itemData.itemConfig.Name)) > 8 then
|
||||
str = SubString(GetLanguageStrById(_itemData.itemConfig.Name), 8) .. "..."
|
||||
elseif GetCurLanguage() == 2 and LengthString(GetLanguageStrById(_itemData.itemConfig.Name)) > 8 then
|
||||
|
|
|
|||
|
|
@ -738,7 +738,6 @@ end
|
|||
|
||||
-- 计算真实伤害
|
||||
function BattleUtil.ApplyDamage(skill, atkRole, defRole, damage, bCrit, damageType, dotType, isDirect)
|
||||
LogError("vvvvvvvvvvvvvvvvvvvvv" .. damage)
|
||||
if defRole == nil then
|
||||
return
|
||||
end
|
||||
|
|
@ -1305,7 +1304,6 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i
|
|||
ignoreDef = 0
|
||||
end
|
||||
-- 攻击力
|
||||
LogError("ffffffffffffffffff"..RoleDataName.Attack)
|
||||
local attack = atkRole:GetRoleData(RoleDataName.Attack) + atkRole.addAttack
|
||||
local ignoreFunc = function(v1, ct)
|
||||
ignoreDef = BattleUtil.CountValue(ignoreDef, v1, ct)
|
||||
|
|
|
|||
|
|
@ -322,9 +322,6 @@ end
|
|||
|
||||
function RoleLogic:GetRoleData(property)
|
||||
local tarPro = self.data:GetData(property)
|
||||
if property == 4 then
|
||||
LogError("bbbbbbbbbbbbbbbbbbb" .. tarPro)
|
||||
end
|
||||
local item
|
||||
for i = 1, self.proTranList.size do
|
||||
item = self.proTranList.buffer[i]
|
||||
|
|
|
|||
|
|
@ -131,10 +131,10 @@ function this.OnShowPanel()
|
|||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||
this.starNumText.text = FightLevelManager.GetAllChapterStars()
|
||||
curChapterId = FightLevelManager.GetCurChapterId()
|
||||
LogError("curChapterId=========" .. curChapterId .. " maxChapterId==" .. maxChapterId)
|
||||
--LogError("curChapterId=========" .. curChapterId .. " maxChapterId==" .. maxChapterId)
|
||||
this.maxTxt.gameObject:SetActive(false)
|
||||
if curChapterId == maxChapterId then
|
||||
LogError("11111111111111111111111111111111111111")
|
||||
--LogError("11111111111111111111111111111111111111")
|
||||
this.maxTxt.gameObject:SetActive(true)
|
||||
this.maxTxt.text = Language[10790]
|
||||
end
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ function this:InitComponent()
|
|||
this.loginPart = this.gameObject
|
||||
|
||||
this.tip = Util.GetGameObject(this.loginPart, "tip/Text")
|
||||
|
||||
this.tip:SetActive(false)
|
||||
this.loginAnim = this.gameObject:GetComponent("Animator")
|
||||
this.loginAnim.enabled = false
|
||||
this.btnLoginPart = Util.GetGameObject(this.loginPart, "jinruyouxi")
|
||||
|
|
@ -124,7 +124,7 @@ function this:InitComponent()
|
|||
this.protos:SetActive(IsUserProtoActive)
|
||||
this.newproto:SetActive(false)
|
||||
this.beianBtn = Util.GetGameObject(this.gameObject, "healthTip/beianTxt")
|
||||
Util.GetGameObject(this.gameObject, "healthTip/beianTxt"):GetComponent("Text").text = "beian.miit.gov.cn"
|
||||
--Util.GetGameObject(this.gameObject, "healthTip/beianTxt"):GetComponent("Text").text = "beian.miit.gov.cn"
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
|
@ -239,7 +239,7 @@ function this:BindEvent()
|
|||
end)
|
||||
|
||||
Util.AddClick(this.beianBtn, function()
|
||||
OpenWeb("https://beian.miit.gov.cn/#/Integrated/index")
|
||||
OpenWeb("https://beian.miit.gov.cn")
|
||||
end)
|
||||
Util.AddClick(this.ConfirmBtn, function()
|
||||
local confirm = PlayerPrefs.GetInt("IHaveConfirmProtos")
|
||||
|
|
|
|||
|
|
@ -550,6 +550,26 @@ local jumpDic = {
|
|||
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.GodsWayTower_1))
|
||||
end
|
||||
end,
|
||||
[JumpType.GodsWayTower_1] = function(data) --多对塔
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GodsWayTower_1) then
|
||||
local time = PlayerPrefs.GetInt(PlayerManager.uid .. "openFightLevelTime")
|
||||
NetManager.RequestDuoduiInfoRequest(function()
|
||||
UIManager.OpenPanel(UIName.GodsWayListPanel)
|
||||
end)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.GodsWayTower_1))
|
||||
end
|
||||
end,
|
||||
[JumpType.GodsWayTower_2] = function(data) --多对塔
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GodsWayTower_2) then
|
||||
local time = PlayerPrefs.GetInt(PlayerManager.uid .. "openFightLevelTime")
|
||||
NetManager.RequestDuoduiInfoRequest(function()
|
||||
UIManager.OpenPanel(UIName.GodsWayListPanel)
|
||||
end)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.GodsWayTower_2))
|
||||
end
|
||||
end,
|
||||
[JumpType.BecomeAGodTower] = function(data) --主角神塔
|
||||
if CheckFunctionOpen(FUNCTION_OPEN_TYPE.GodsWayTower_3) then
|
||||
NetManager.RequestDuoduiInfoRequest(function()
|
||||
|
|
@ -1027,7 +1047,7 @@ function this.GoJump(_jumpId, fun, ...)
|
|||
local serData = ActTimeCtrlManager.GetSerDataByTypeId(jumpSData.Type)
|
||||
if serData then
|
||||
if ActTimeCtrlManager.SingleFuncState(jumpSData.Type) then
|
||||
--LogError("ssssssssssss" .. jumpSData.Type)
|
||||
LogError("ssssssssssss" .. jumpSData.Type)
|
||||
jumpDic[jumpSData.Type](jumpSData.Skipfactor)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(jumpSData.Type))
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ function SettingInfo:InitComponent(gameObject, rootPanel)
|
|||
local fankuiText = this.fankui:GetComponent("Text")
|
||||
fankuiText.text = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.SHOW_EMAIL_SETTING) or ""
|
||||
end
|
||||
|
||||
this.instructionsBtn = Util.GetGameObject(gameObject, "other/protos/instructionsBtn")
|
||||
this.privacyBtn = Util.GetGameObject(gameObject, "other/protos/privacyBtn")
|
||||
this.name = Util.GetGameObject(gameObject, "playerInfo/name/Text")
|
||||
this.btnChangeName = Util.GetGameObject(gameObject, "playerInfo/name/Image/btn")
|
||||
|
||||
|
|
@ -133,6 +134,13 @@ function SettingInfo:BindEvent()
|
|||
end
|
||||
)
|
||||
end
|
||||
--用户隐私协议
|
||||
Util.AddClick(this.instructionsBtn, function()
|
||||
OpenWeb("https://yhxy.tiandiyouxi.com")
|
||||
end)
|
||||
Util.AddClick(this.privacyBtn, function()
|
||||
OpenWeb("https://yszx.tiandiyouxi.com")
|
||||
end)
|
||||
if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_SELECT_RESLUTION) then
|
||||
this.selectResolution.onValueChanged:AddListener(
|
||||
function(value)
|
||||
|
|
|
|||
Loading…
Reference in New Issue