[主题活动] 修改提交

dev_chengFeng
jiaoyangna 2020-11-12 16:07:19 +08:00
parent da372f48df
commit 7fc14ec822
24 changed files with 67706 additions and 64945 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 506d6c88670ee634d97f3fc55d86e298
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b03925b92b5e2674da7deb5669b5d757
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c43bb920e0a8da34da5a242db2738797
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0a4c684ca95a4d74e87043c69b271d6a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f62796312f388f442931c5eaa802e268
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 89a5d87f170edf349b83b674fa863394
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 072c5acffee40434896941c06713f756
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 21a0388ffc0aa1f49b934cc2e19fd213
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a3b3401964cc0a54e82739f8aa60f4e5
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: deaae470cdb57aa4ea286389884e0365
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d24762ab721f88e45867492426bb9b60
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -115,38 +115,30 @@ local _PageInfo = {--后期可以做成tableInserticon名字都去读表
[20] = 7,
[21] = 9,
}
local curActivityCount = {
[1] = require("Modules/DynamicActivity/DynamicTaskPage"),
[2] = require("Modules/DynamicActivity/SheJiDaDian"),
[3] = require("Modules/DynamicActivity/TimeLimitedCall"),
[4] = require("Modules/DynamicActivity/QianKunBox"),
[5] = require("Modules/DynamicActivity/ZhenQiYiBaoPage"),
[6] = require("Modules/DynamicActivity/LeiJiChongZhiPage"),
[7] = require("Modules/DynamicActivity/XianShiShangShi"),
[8] = require("Modules/Expert/DynamicActivityExChange"),
[9] = require("Modules/DynamicActivity/YiJingBaoKu"),
[10] = require("Modules/DynamicActivity/ShengYiTianJiang"),
[11] = require("Modules/DynamicActivity/LingShowTeHui"),
}
local TimeLimitedCall = require("Modules/DynamicActivity/TimeLimitedCall")
local QianKunBox = require("Modules/DynamicActivity/QianKunBox")
local DynamicActPage=require("Modules/DynamicActivity/DynamicTaskPage")
local ZhenQiYiBaoPage=require("Modules/DynamicActivity/ZhenQiYiBaoPage")
local LeiJiChongZhiPage=require("Modules/DynamicActivity/LeiJiChongZhiPage")
local XianShiShangShi=require("Modules/DynamicActivity/XianShiShangShi")
local SheJiDaDian=require("Modules/DynamicActivity/SheJiDaDian")
local XianShiDuiHuan=require("Modules/Expert/DynamicActivityExChange")
local YiJingBaoKu=require("Modules/DynamicActivity/YiJingBaoKu")
local ShengYiTianJiang = require("Modules/DynamicActivity/ShengYiTianJiang")
local LingShowTeHui = require("Modules/DynamicActivity/LingShowTeHui")
--初始化组件(用于子类重写)
function DynamicActivityPanel:InitComponent()
orginLayer = 0
this.tabbox = Util.GetGameObject(self.gameObject, "bg/tabbox")
this.btnBack = Util.GetGameObject(self.gameObject, "bg/btnBack")
this.content = Util.GetGameObject(self.gameObject, "bg/pageContent")
this.PageList = {
[1] = DynamicActPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
[2] = SheJiDaDian.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_8")),
[3] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
[4] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
[5] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
[6] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
[7] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")),
[8] = XianShiDuiHuan.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")),
[9] = YiJingBaoKu.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_9")),
[10] = ShengYiTianJiang.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_10")),
[11] = LingShowTeHui.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_11")),
}
this.PageList = {}
for i=1,#curActivityCount do
this.PageList[i] = curActivityCount[i].new(self, Util.GetGameObject(self.transform, "bg/pageContent/page"..i))
end
-- 上部货币显示
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft})