Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
1912473cbe
Binary file not shown.
Before Width: | Height: | Size: 3.4 MiB |
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 96464d4ea795bd34183ef07cdcb8e51b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 4.2 MiB |
|
@ -64,7 +64,7 @@ TextureImporter:
|
|||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
compressionQuality: 100
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
|
@ -91,6 +91,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 1.5 MiB |
|
@ -64,7 +64,7 @@ TextureImporter:
|
|||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
compressionQuality: 100
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
|
@ -91,6 +91,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
|
@ -57,3 +57,5 @@ MonoBehaviour:
|
|||
compressType: 1
|
||||
- asset: {fileID: 102900000, guid: ddfa1c1ffb0ca1e4db51985fcba257e4, type: 3}
|
||||
compressType: 1
|
||||
- asset: {fileID: 102900000, guid: 96464d4ea795bd34183ef07cdcb8e51b, type: 3}
|
||||
compressType: 1
|
||||
|
|
|
@ -125,7 +125,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2019625878
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -1244,10 +1244,10 @@ RectTransform:
|
|||
m_Father: {fileID: 224787418950452670}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 722, y: -1554}
|
||||
m_SizeDelta: {x: 534.92, y: 123}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -358, y: 366.00024}
|
||||
m_SizeDelta: {x: 534.9199, y: 123}
|
||||
m_Pivot: {x: 0.52412736, y: 1.0000001}
|
||||
--- !u!114 &1256568015606124665
|
||||
MonoBehaviour:
|
||||
|
@ -37584,10 +37584,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6353282796528682181}
|
||||
m_RootOrder: 1
|
||||
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: 410, y: 13.5}
|
||||
m_SizeDelta: {x: 164.65, y: 58}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -130, y: -73.5}
|
||||
m_SizeDelta: {x: 164.65002, y: 58}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7523277774350379745
|
||||
CanvasRenderer:
|
||||
|
@ -62893,10 +62893,10 @@ RectTransform:
|
|||
m_Father: {fileID: 224787418950452670}
|
||||
m_RootOrder: 13
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0.0000019073, y: -87}
|
||||
m_SizeDelta: {x: 1080, y: 174}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -87}
|
||||
m_SizeDelta: {x: 0, y: 174}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8277816123373088988
|
||||
CanvasRenderer:
|
||||
|
@ -64842,9 +64842,9 @@ RectTransform:
|
|||
m_Father: {fileID: 224787418950452670}
|
||||
m_RootOrder: 15
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 138.25, y: 1847}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 138.25, y: -73}
|
||||
m_SizeDelta: {x: 276.5, y: 82.30005}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5486231635445567020
|
||||
|
|
|
@ -4551,7 +4551,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||
m_Material: {fileID: 2100000, guid: 42263669b8cc5c04a96720be44775913, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
|
|
|
@ -1871,7 +1871,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 4567892664886318}
|
||||
- component: {fileID: 114611151010125922}
|
||||
- component: {fileID: 4264889797209096721}
|
||||
m_Layer: 5
|
||||
m_Name: UpdatePanel
|
||||
m_TagString: Untagged
|
||||
|
@ -1910,20 +1909,6 @@ MonoBehaviour:
|
|||
tipsText: {fileID: 6257169991249000306}
|
||||
slider: {fileID: 114363176137009512}
|
||||
msgBox: {fileID: 114889054646747368}
|
||||
--- !u!114 &4264889797209096721
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1760809705854780}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
bgList:
|
||||
- {fileID: 1403187064933534}
|
||||
--- !u!1 &1773781807604024
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -2313,14 +2313,14 @@ BATTLE_TYPE = {
|
|||
Senro = 12, -- 森罗幻境
|
||||
XuanYuan = 13, -- 轩辕宝镜
|
||||
GuildTranscript = 14, -- 公会副本
|
||||
ARENA = 15, -- 竞技场
|
||||
ARENA = 15, -- 竞技场
|
||||
XINJIANG = 16, --新将来袭
|
||||
XIAOYAOYOU = 18, --逍遥游战斗
|
||||
XIAOYAOYOU = 18, --逍遥游战斗
|
||||
TASUILINGXIAO = 19, --踏碎凌霄
|
||||
FIGHTLEVEL = 20, --山河社稷图主关卡
|
||||
FIGHTLEVEL = 20, --山河社稷图主关卡
|
||||
FIGHT_ASSISTANT_LEVEL = 21, --山河社稷图副关卡战斗
|
||||
BACK_BATTLE = 1000, -- 系统战斗回放
|
||||
EndlessMpaFight = 22,
|
||||
BACK_BATTLE = 1000, -- 系统战斗回放
|
||||
EndlessMpaFight = 22, -- 无尽副本
|
||||
}
|
||||
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||
[2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||
|
|
|
@ -9,7 +9,7 @@ function PackageManager.Initialize()
|
|||
|
||||
-- 获取当前包配置名,没有就按本地配置
|
||||
this.ConfigName = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.PACKAGE_CONFIG)
|
||||
if this.ConfigName then
|
||||
if not this.ConfigName then
|
||||
this.ConfigName = "LOCAL"
|
||||
end
|
||||
|
||||
|
@ -64,15 +64,19 @@ function PackageManager.SetVideo(obj, bg)
|
|||
if this.config.VideoName then
|
||||
if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_PLAY_LOGIN_VIDEO) then
|
||||
Log("加载视频:"..tostring(this.config.VideoName))
|
||||
resMgr:PreLoadAssetAsync(this.config.VideoName, function()
|
||||
if UIManager.IsOpen(UIName.LoginPanel) then
|
||||
local video = obj:GetComponent("VideoPlayer")
|
||||
-- video.url = ServerConfigManager.GetVersionInfo("resUrl") .. AppConst.PlatformPath .."/"..tostring(this.config.VideoName) ..".mp4"
|
||||
-- video.clip = resMgr:LoadAsset(this.config.VideoName)
|
||||
video.url = AppConst.PersistentDataPath .."/"..tostring(this.config.VideoName)
|
||||
video:Play()
|
||||
bg:DOFade(0, 2)
|
||||
obj:SetActive(true)
|
||||
resMgr:PreLoadAssetAsync(this.config.VideoName, function(isOk)
|
||||
if isOk then
|
||||
if UIManager.IsOpen(UIName.LoginPanel) then
|
||||
local video = obj:GetComponent("VideoPlayer")
|
||||
-- video.url = ServerConfigManager.GetVersionInfo("resUrl") .. AppConst.PlatformPath .."/"..tostring(this.config.VideoName) ..".mp4"
|
||||
-- video.clip = resMgr:LoadAsset(this.config.VideoName)
|
||||
video.url = AppConst.PersistentDataPath .."/"..tostring(this.config.VideoName)
|
||||
video:Play()
|
||||
bg:DOFade(0, 2)
|
||||
obj:SetActive(true)
|
||||
end
|
||||
else
|
||||
LogError("视频加载失败:"..this.config.VideoName)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
|
|
@ -20,7 +20,7 @@ this.space = 100
|
|||
local UIConfig
|
||||
local unpack = unpack
|
||||
local standard = 16 / 9
|
||||
local DELAY_TIME = 2 --超过延迟时间,界面被销毁
|
||||
local DELAY_TIME = 5--超过延迟时间,界面被销毁
|
||||
local delayDestoryList = {}
|
||||
local function update()
|
||||
for k,v in pairs(delayDestoryList) do
|
||||
|
@ -737,7 +737,7 @@ function UIManager.DelayDestroyPanel(panel)
|
|||
item = { delayTime = 0, panel = panel }
|
||||
delayDestoryList[panel.uiConfig.id] = item
|
||||
end
|
||||
item.delayTime = Time.realtimeSinceStartup + DELAY_TIME * panel.openNum
|
||||
item.delayTime = Time.realtimeSinceStartup + DELAY_TIME-- * panel.openNum
|
||||
end
|
||||
|
||||
function UIManager.DestroyPanel(panel)
|
||||
|
|
|
@ -589,7 +589,7 @@ function this.GetContinuityRechargeRedPoint()
|
|||
redPoint = redPoint or (rechargeInfo.progress == 1 and rechargeInfo.state == 0)
|
||||
end
|
||||
end
|
||||
LogGreen("积天豪礼红点:"..tostring(redPoint))
|
||||
-- LogGreen("积天豪礼红点:"..tostring(redPoint))
|
||||
return redPoint
|
||||
end
|
||||
|
||||
|
|
|
@ -759,8 +759,6 @@ function BagPanel:OnDestroy()
|
|||
this.ScrollView1 = nil
|
||||
ClearRedPointObject(RedPointType.Bag_HeroDebris, tabs1RedPoint[ItemBaseType.HeroChip])
|
||||
ClearRedPointObject(RedPointType.Bag_BoxAndBlueprint, tabs1RedPoint[ItemBaseType.Special])
|
||||
ClearRedPointObject(RedPointType.Setting, this.headRedpot)
|
||||
ClearRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint)
|
||||
list={}
|
||||
orginLayer2=0
|
||||
orginLayer=0
|
||||
|
|
|
@ -882,10 +882,19 @@ function this.GetBattleBg(fightType)
|
|||
index = 1002
|
||||
elseif fightType == BATTLE_TYPE.XuanYuan then
|
||||
index = 1003
|
||||
elseif fightType == BATTLE_TYPE.DEATH_POS then
|
||||
elseif fightType == BATTLE_TYPE.DEATH_POS
|
||||
or fightType == BATTLE_TYPE.MONSTER_CAMP
|
||||
then
|
||||
index = 1004
|
||||
elseif fightType == BATTLE_TYPE.TASUILINGXIAO then
|
||||
index = 1006
|
||||
elseif fightType == BATTLE_TYPE.EndlessMpaFight then -- 无尽副本
|
||||
index = 5
|
||||
elseif fightType == BATTLE_TYPE.DAILY_CHALLENGE -- 日常副本
|
||||
or fightType == BATTLE_TYPE.FIGHTLEVEL -- 山河社稷图
|
||||
or fightType == BATTLE_TYPE.FIGHT_ASSISTANT_LEVEL
|
||||
then
|
||||
index = 2
|
||||
end
|
||||
return "r_zhandou_changjing_"..tostring(index)
|
||||
end
|
||||
|
|
|
@ -50,9 +50,9 @@ local UpdateBtnGMFunc = {
|
|||
if not BattleManager.IsUnlockBattlePass() then
|
||||
return SKIP_STATE.LOCK, "25级或充值任意金额后解锁"
|
||||
end
|
||||
-- if FightPointPassManager.GetCurOpenFightIdIsBoss() then
|
||||
-- return SKIP_STATE.NOUSE, "首领关卡无法跳过!"
|
||||
-- end
|
||||
if FightPointPassManager.GetCurOpenFightIdIsBoss() then
|
||||
return SKIP_STATE.NOUSE, "首领关卡无法跳过!"
|
||||
end
|
||||
return SKIP_STATE.UNLOCK
|
||||
end,
|
||||
}
|
||||
|
|
|
@ -76,7 +76,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss)
|
|||
self.RoleLiveGO:GetComponent("RectTransform").anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2])-- * 0.5
|
||||
self.RoleLiveGO.transform.localScale = Vector3.one * self.enemy_liveScale --* 0.75
|
||||
self.RoleLiveGO:SetActive(true)
|
||||
Log("IsBoss: "..tostring(self.isBoss))
|
||||
-- Log("IsBoss: "..tostring(self.isBoss))
|
||||
if self.isBoss then
|
||||
self.RoleLiveGO.transform.localScale = self.RoleLiveGO.transform.localScale * 1.5 -- boss 放大1.5倍
|
||||
end
|
||||
|
|
|
@ -33,14 +33,14 @@ function ActivityMainPanel:BindEvent()
|
|||
Util.AddClick(this.btnBack, function()
|
||||
DynamicActivityManager.RemoveUIList()
|
||||
if #DynamicActivityManager.OpenUIList > 0 then
|
||||
LogRed("jump ")
|
||||
-- LogRed("jump ")
|
||||
JumpManager.GoJump(DynamicActivityManager.OpenUIList[#DynamicActivityManager.OpenUIList],function()
|
||||
DynamicActivityManager.RemoveUIList()
|
||||
end)
|
||||
else
|
||||
LogRed("close ")
|
||||
-- LogRed("close ")
|
||||
this:ClosePanel()
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
@ -77,7 +77,7 @@ function ActivityMainPanel:CheckActOpen(_index)
|
|||
else
|
||||
_CurPageIndex = _index
|
||||
end
|
||||
LogGreen(tabs[_index].ActiveType.." _CurPageIndex:".._CurPageIndex)
|
||||
Log("当前界面:"..tabs[_index].ActiveType.." _CurPageIndex:".._CurPageIndex)
|
||||
end
|
||||
elseif tabs[_index].FunType > 0 then
|
||||
if ActTimeCtrlManager.SingleFuncState(tabs[_index].FunType) then
|
||||
|
|
|
@ -71,13 +71,16 @@ function this.OnFunctionOpen(funcId)
|
|||
end
|
||||
--LogGreen(tostring(AppConst.isGuide))
|
||||
local guideId = GlobalSystemConfig[funcId].GuideId
|
||||
if GuideConfig[guideId].IsOpen > 0 then
|
||||
if not guideId or guideId == 0 then
|
||||
return
|
||||
end
|
||||
if GuideConfig[guideId] and GuideConfig[guideId].IsOpen > 0 then
|
||||
if not ActivityGiftManager.IsActivityTypeOpen(ActivityGiftManager.GetActivityTypeFromId(GuideConfig[guideId].IsOpen)) then
|
||||
Log("活动:"..tostring(GuideConfig[guideId].IsOpen).."未开启,引导Id:"..guideId.."未执行!")
|
||||
return
|
||||
end
|
||||
end
|
||||
if guideId and guideId ~= 0 and not funcDic[guideId] then
|
||||
if not funcDic[guideId] then
|
||||
table.insert(_FuncGuideList, guideId)
|
||||
end
|
||||
--
|
||||
|
|
|
@ -177,7 +177,6 @@ function MyGuildManager.ReuqsetRedPackage(func)
|
|||
NetManager.GetAllRedPacketResponse(function(msg)
|
||||
local num=0
|
||||
local SpecialConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,115)
|
||||
LogError("--------------------")
|
||||
for i = 1, #msg.info do
|
||||
local config=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,msg.info[i].redType)
|
||||
if config and msg.info[i].isGet==0 and (config.Num-msg.info[i].getCount)>0 then
|
||||
|
@ -186,12 +185,10 @@ function MyGuildManager.ReuqsetRedPackage(func)
|
|||
end
|
||||
end
|
||||
end
|
||||
LogError("*************************")
|
||||
this.PackageNum=num
|
||||
CheckRedPointStatus(RedPointType.Guid_GetPackage)
|
||||
CheckRedPointStatus(RedPointType.Guid_SendPackage)
|
||||
--CheckRedPointStatus(RedPointType.Guild_RedPacket)
|
||||
LogError("///////////////////")
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
|
|
|
@ -118,6 +118,10 @@ function RedPacketPanel:OnClose()
|
|||
this.contents[i].view:OnClose()
|
||||
end
|
||||
ClearRedPointObject(RedPointType.Guild_RedPacket,this.redPoint)
|
||||
if redPointList[2] and redPointList[3] then
|
||||
ClearRedPointObject(RedPointType.Guid_SendPackage, redPointList[2])
|
||||
ClearRedPointObject(RedPointType.Guid_GetPackage, redPointList[3])
|
||||
end
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
|
@ -126,6 +130,7 @@ function RedPacketPanel:OnDestroy()
|
|||
this.contents[i].view:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
end
|
||||
redPointList=nil
|
||||
end
|
||||
|
||||
|
||||
|
|
|
@ -247,7 +247,7 @@ function this:SetInitList()
|
|||
end
|
||||
this.ChooseDataList = tempTable
|
||||
|
||||
LogBlue("#this.ChooseDataList长度:"..#this.ChooseDataList)
|
||||
-- LogBlue("#this.ChooseDataList长度:"..#this.ChooseDataList)
|
||||
end
|
||||
--初始化 鸿蒙塔的数据
|
||||
function this:SetTowerInit()
|
||||
|
|
|
@ -124,7 +124,6 @@ function MailMainPanel:OnOpen(...)
|
|||
openPanel=data[1]
|
||||
end
|
||||
function MailMainPanel:OnShow()
|
||||
Log("MailMainPanel:OnShow")
|
||||
isPlayAnim = true
|
||||
allMail={}
|
||||
NetManager.GetAllMailData(function ()
|
||||
|
@ -140,7 +139,7 @@ end
|
|||
local maildataCount=0--数据数量
|
||||
--设置英雄列表数据
|
||||
function this.OnShowMailListData(_allMail, isTop,isAni)
|
||||
LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni))
|
||||
-- LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni))
|
||||
allMail= _allMail
|
||||
this:SortAllMail(allMail)
|
||||
maildataCount=#allMail
|
||||
|
|
|
@ -55,7 +55,7 @@ function this.OnShowPanelData(isTop,isAni)
|
|||
table.insert(AllData,v)
|
||||
end
|
||||
this.RewardTabsSort(AllData)
|
||||
LogRed("isTop "..tostring(not isTop).." isAni "..tostring(not isAni))
|
||||
-- LogRed("isTop "..tostring(not isTop).." isAni "..tostring(not isAni))
|
||||
this.ScrollView:SetData(AllData, function (index, go)
|
||||
this.SingleDataShow(go, AllData[index])
|
||||
end, not isTop,not isAni)
|
||||
|
|
|
@ -152,9 +152,8 @@ function this.InitTaskData(curData,taskType,configName)
|
|||
allListData[i].Integral[1][1],
|
||||
allListData[i].Integral[1][2]
|
||||
},
|
||||
}
|
||||
|
||||
data.type = allListData[i].Type
|
||||
}
|
||||
data.type = allListData[i].Type
|
||||
data.jump = allListData[i].Jump[1]
|
||||
table.insert(curData.rewards,data)
|
||||
end
|
||||
|
@ -310,7 +309,7 @@ function this.InitSingleTypeData(actType)
|
|||
local data = ActivityGiftManager.GetActivityTypeInfo(actType)
|
||||
if data then
|
||||
singleTypeData = {}
|
||||
LogYellow("InitData activityId:"..tostring(data.activityId).." value:"..tostring(data.value).." startTime:"..tostring(data.startTime).." endTime:"..tostring(data.endTime).." mission:"..tostring(#data.mission))
|
||||
Log("InitData activityId:"..tostring(data.activityId).." value:"..tostring(data.value).." startTime:"..tostring(data.startTime).." endTime:"..tostring(data.endTime).." mission:"..tostring(#data.mission))
|
||||
singleTypeData.activityId = data.activityId
|
||||
singleTypeData.value = data.value
|
||||
singleTypeData.startTime = data.startTime
|
||||
|
|
|
@ -568,13 +568,13 @@ function this.ClearObject(rpType, rpObj)
|
|||
table.remove(BindObjs[rpType], indexToKill)
|
||||
--Log("红点类型 = "..rpType..", 解绑了一个物体,当前绑定的物体数量为 = "..#BindObjs[rpType])
|
||||
else
|
||||
Log("红点类型 ".. rpType .. ",在该红点绑定物体中没有找到要解除绑定的物体,请检查")
|
||||
LogRed("红点类型 ".. rpType .. ",在该红点绑定物体中没有找到要解除绑定的物体,请检查")
|
||||
end
|
||||
else
|
||||
if BindObjs then
|
||||
BindObjs[rpType] = {}
|
||||
end
|
||||
--Log("红点类型 = "..rpType..", 解绑了所有物体,当前绑定的物体数量为 = "..#BindObjs[rpType])
|
||||
LogRed("红点类型 = "..rpType..", 解绑了所有物体,当前绑定的物体数量为 = "..#BindObjs[rpType])
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -369,9 +369,6 @@ function RoleListPanel:OnDestroy()
|
|||
|
||||
SubUIManager.Close(this.UpView)
|
||||
SubUIManager.Close(this.BtView)
|
||||
ClearRedPointObject(RedPointType.Setting, this.headRedpot)
|
||||
ClearRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint)
|
||||
|
||||
this.ScrollView = nil
|
||||
|
||||
if this.playerInfoView then
|
||||
|
|
|
@ -54,12 +54,14 @@ end
|
|||
|
||||
--绑定事件(用于子类重写)
|
||||
function StoryMapPanel:BindEvent()
|
||||
Util.AddClick(this.btnSkip, function ()
|
||||
--StoryMapManager.GetSingleStoryConfig()
|
||||
MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function()
|
||||
isSkip = true
|
||||
this:StackPop()
|
||||
end,"取消","确认")
|
||||
Util.AddClick(this.btnSkip, function ()
|
||||
if not isSkip then
|
||||
--StoryMapManager.GetSingleStoryConfig()
|
||||
MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function()
|
||||
isSkip = true
|
||||
this:StackPop()
|
||||
end,"取消","确认")
|
||||
end
|
||||
end)
|
||||
Util.AddClick(this.btnGoOn, function ()
|
||||
this:ShowDialog()
|
||||
|
|
|
@ -56,7 +56,6 @@ end
|
|||
-- 设置头像框
|
||||
function PlayerHeadView:SetFrame(frameId)
|
||||
self.frame:SetActive(true)
|
||||
print(frameId)
|
||||
self.frame:GetComponent("Image").sprite = GetPlayerHeadFrameSprite(self.spLoader, frameId)
|
||||
-- 检测特效
|
||||
self:UnLoadFrameEffect()
|
||||
|
|
|
@ -105,7 +105,6 @@ function PlayerInfoView:OnShow()
|
|||
self.playerHead:SetPosition(Vector3.New(-5, 8, 0))
|
||||
-- self.playerHead:SetLayer(self.sortingOrder)
|
||||
self.playerHead:SetEffectScale(0.85)
|
||||
|
||||
end
|
||||
|
||||
function PlayerInfoView:RefreshPower(force)
|
||||
|
|
|
@ -170,6 +170,7 @@ function UpView:OnClose()
|
|||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
self.IsClose = true
|
||||
end
|
||||
|
||||
function UpView:SetShowType(context)
|
||||
|
@ -198,37 +199,42 @@ function UpView:SetShowType(context)
|
|||
end
|
||||
|
||||
function UpView:UpdateGoldVal()
|
||||
if self.IsClose then
|
||||
return
|
||||
end
|
||||
-- 先清一遍红点
|
||||
self:_ClearRP()
|
||||
local panelShowItemList = self.itemList
|
||||
for i = 1, _ItemMaxNum do
|
||||
if panelShowItemList[i] then
|
||||
if self.cnyList[i].gameObject then
|
||||
self.cnyList[i]:SetActive(true)
|
||||
Util.GetGameObject(self.cnyList[i], "icon"):GetComponent("Image").sprite = SetIcon(self.spLoader, panelShowItemList[i])
|
||||
Util.GetGameObject(self.cnyList[i], "addFlag"):SetActive(_IsShowPlus(panelShowItemList[i]))
|
||||
self.cnyList[i].gameObject:SetActive(true)
|
||||
Util.GetGameObject(self.cnyList[i].gameObject, "icon"):GetComponent("Image").sprite = SetIcon(self.spLoader, panelShowItemList[i])
|
||||
Util.GetGameObject(self.cnyList[i].gameObject, "addFlag"):SetActive(_IsShowPlus(panelShowItemList[i]))
|
||||
if panelShowItemList[i] == 20 then
|
||||
Util.GetGameObject(self.cnyList[i], "addFlag"):SetActive(true)
|
||||
Util.GetGameObject(self.cnyList[i].gameObject, "addFlag"):SetActive(true)
|
||||
end
|
||||
if panelShowItemList[i] == 2 then
|
||||
Util.GetGameObject(self.cnyList[i], "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])) .. "/" .. PlayerManager.maxEnergy
|
||||
Util.GetGameObject(self.cnyList[i].gameObject, "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])) .. "/" .. PlayerManager.maxEnergy
|
||||
elseif panelShowItemList[i] == 44 then
|
||||
Util.GetGameObject(self.cnyList[i], "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])).."/"..PrivilegeManager.GetPrivilegeNumber(9)
|
||||
Util.GetGameObject(self.cnyList[i].gameObject, "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])).."/"..PrivilegeManager.GetPrivilegeNumber(9)
|
||||
elseif panelShowItemList[i] == 53 then
|
||||
Util.GetGameObject(self.cnyList[i], "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])).."/"..MonsterCampManager.GetMaxCostItem()
|
||||
Util.GetGameObject(self.cnyList[i].gameObject, "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])).."/"..MonsterCampManager.GetMaxCostItem()
|
||||
elseif panelShowItemList[i] == 87 then
|
||||
Util.GetGameObject(self.cnyList[i], "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i]))
|
||||
Util.GetGameObject(self.cnyList[i].gameObject, "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i]))
|
||||
else
|
||||
Util.GetGameObject(self.cnyList[i], "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i]))
|
||||
Util.GetGameObject(self.cnyList[i].gameObject, "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i]))
|
||||
end
|
||||
|
||||
-- 绑定红点
|
||||
local redpot = Util.GetGameObject(self.cnyList[i], "redpot")
|
||||
local redpot = Util.GetGameObject(self.cnyList[i].gameObject, "redpot")
|
||||
redpot:SetActive(false)
|
||||
self:_BindRP(panelShowItemList[i], redpot)
|
||||
end
|
||||
else
|
||||
self.cnyList[i]:SetActive(false)
|
||||
if self.cnyList[i].gameObject then
|
||||
self.cnyList[i].gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -44,10 +44,10 @@ namespace GameLogic
|
|||
{
|
||||
if (AppConst.bundleMode)
|
||||
{
|
||||
string path = AppConst.PersistentDataPath + "lz4/bg/loading/" + updatePanelBg + ".unity3d";
|
||||
string path = AppConst.PersistentDataPath + "lz4/bgnc/" + updatePanelBg + ".unity3d";
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
path = AppConst.StreamPath + "lz4/bg/loading/" + updatePanelBg + ".unity3d";
|
||||
path = AppConst.StreamPath + "lz4/bgnc/" + updatePanelBg + ".unity3d";
|
||||
}
|
||||
bundle = AssetBundle.LoadFromFile(path, 0, GameLogic.AppConst.EncyptBytesLength);
|
||||
if (bundle == null)
|
||||
|
@ -60,7 +60,7 @@ namespace GameLogic
|
|||
else
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
string path = AppConst.GameResPath + "/BG/Loading/" + updatePanelBg + ".jpg";
|
||||
string path = AppConst.GameResPath + "/BGNC/" + updatePanelBg + ".jpg";
|
||||
Sprite sp = UnityEditor.AssetDatabase.LoadAssetAtPath<Sprite>(path);
|
||||
this.transform.Find("Canvas/LoadingScreen/bg1").GetComponent<Image>().sprite = sp;
|
||||
#endif
|
||||
|
|
|
@ -26,9 +26,20 @@ public class UIBgAdaptive : MonoBehaviour
|
|||
//bgList[i].GetComponent<RectTransform>().sizeDelta = new Vector2(curWidth, curHeight);
|
||||
if (Screen.height >= 1920)
|
||||
{
|
||||
float curWidth = (1080f / 1920f) * Screen.height;
|
||||
//--计算比例因子 比例因子 = 10 ^ ((lg(屏幕宽 / 开发宽) + lg(屏幕高 / 开发高) / 2))
|
||||
//local log = math.log(Screen.width / 1080, 10) + math.log(Screen.height / 1920, 10)
|
||||
//local avg = log / 2
|
||||
//local ft = math.pow(10, avg)
|
||||
//-- 实际分辨率 = 屏幕分辨率 / 比例因子
|
||||
//UIManager.UIHeight = Screen.height / ft
|
||||
//UIManager.UIWidth = Screen.width / ft
|
||||
float log = Mathf.Log10(Screen.width / 1080f) + Mathf.Log10(Screen.height / 1920f);
|
||||
float avg = log / 2f;
|
||||
float ft = Mathf.Pow(10, avg);
|
||||
float curHeight = Screen.height / ft;
|
||||
float curWidth = curHeight /1920f * 1080f;
|
||||
//Debug.Log("Screen.height " + Screen.height+ " curWidth "+ curWidth);
|
||||
bgList[i].GetComponent<RectTransform>().sizeDelta = new Vector2(curWidth, Screen.height);
|
||||
bgList[i].GetComponent<RectTransform>().sizeDelta = new Vector2(curWidth, curHeight);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue