Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-03-17 11:54:40 +08:00
commit dfd3c4acc6
5 changed files with 17 additions and 17 deletions

View File

@ -81309,16 +81309,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6326206260521214743}
m_LocalRotation: {x: 0, y: 0, z: -0.026176924, w: 0.99965733}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children: []
m_Father: {fileID: 4810961925972088587}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -3}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 146, y: 15}
m_AnchoredPosition: {x: 78, y: 21}
m_SizeDelta: {x: 200, y: 210}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &873408025694133751
@ -81664,17 +81664,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6865133760093087843}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: -0.08715578, w: 0.9961947}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children: []
m_Father: {fileID: 4810961925972088587}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -10}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 88, y: 16}
m_SizeDelta: {x: 44, y: 86}
m_AnchoredPosition: {x: 163, y: 10}
m_SizeDelta: {x: 46, y: 46}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8392695639743829547
CanvasRenderer:
@ -81704,7 +81704,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: 1e2d84c75cd281242a2bf1f69edfec36, type: 3}
m_Sprite: {fileID: 21300000, guid: 8433faecc652d374ab2a8398d559dfcb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -29,7 +29,7 @@ local update = function()
SDKMgr:ExitGame()
end
else
MsgPanel.ShowTwo(Language[12108], nil, function()
SysPanel.ShowTwo(Language[12108], nil, function()
Game.Quit()
end)
end
@ -37,7 +37,7 @@ local update = function()
-- 临时退出游戏代码
if not AppConst.isSDK and Input.GetKeyDown(UnityEngine.KeyCode.Tab) then
MsgPanel.ShowTwo(Language[11857], nil, function()
SysPanel.ShowTwo(Language[11857], nil, function()
Game.Logout()
end)
end

View File

@ -40,9 +40,9 @@ function this.SetBasicValues(giftGoodsList)
local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID".. giftGoodsInfo.goodsId .." 已购:"
..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
..giftGoodsInfo.endTime .. " 可购(没卵用)" .. giftGoodsInfo.dynamicBuyTimes)
-- LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID".. giftGoodsInfo.goodsId .." 已购:"
-- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
-- ..giftGoodsInfo.endTime .. " 可购(没卵用)" .. giftGoodsInfo.dynamicBuyTimes)
if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then
else
if giftGoodsInfoList[rechargeConfigLocal.Type] then

View File

@ -8,7 +8,7 @@ local ImgType = {
bg = "y_yjj_128beijdi",
mask = "y_yjj_128dikuang001",
rewardBg = "y_yjj_128kuang",
moneyTag = "y_yjj_$19.99",
moneyTag = "y_yjj_128",
downBg = "y_yjj_128kuang001",
rewardPreview = "y_yjj_128kuang002_zh",
valueMask = "y_yjj_128jjz002",
@ -17,7 +17,7 @@ local ImgType = {
bg = "y_yjj_328beijdi",
mask = "y_yjj_328dikuang001",
rewardBg = "y_yjj_328kuang",
moneyTag = "y_yjj_$49.99",
moneyTag = "y_yjj_328",
downBg = "y_yjj_328kuang001",
rewardPreview = "y_yjj_328kuang002_zh",
valueMask = "y_yjj_328jjz002",

View File

@ -23,7 +23,7 @@ function TimeLimitSkin:BindEvent()
this:ClosePanel()
end)
Util.AddClick(this.previewBtn,function ()
local battleId = 1006
local battleId = 1015
local fdata, fseed = BattleManager.GetFakeBattleData(battleId)
local testFightData = {
fightData = fdata,