Commit Graph

131 Commits (cf38744969de482548f627e9b66d5c52c6470f67)

Author SHA1 Message Date
gaoxin 07a35aec13 【幸运探宝】按钮位置修改 2021-06-09 20:20:16 +08:00
gaoxin a10d34b076 【逐胜之巅】入口资源添加文字 2021-06-09 18:18:35 +08:00
gaoxin 5a54f51107 【主界面】逐胜之巅资源替换 2021-06-09 15:00:49 +08:00
gaoxin 9a164336fa 【资源】战斗背景替换,主界面删除转盘 2021-06-09 14:52:00 +08:00
ZhangBiao a96a61ec77 【逐胜之巅】入口调整至左侧 2021-06-07 11:18:37 +08:00
zhangqiang 78ece97bfd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:54:30 +08:00
zhangqiang 1dc1ad1db1 【幸运探宝】加标签 2021-05-28 15:54:20 +08:00
ZhangBiao 3c67b0b8f3 【主城】icon问题调整 2021-05-28 15:35:02 +08:00
gaoxin c76af7fe0b 【左上角图标UI】六星玉帝图标没有置顶 2021-05-28 11:23:10 +08:00
gaoxin 9f8858b4f7 【主界面】左上角按钮自动排列 2021-05-27 18:20:32 +08:00
gaoxin ba4debba7b 【主界面】左上角按钮自动排列 2021-05-27 18:13:03 +08:00
ZhangBiao d7cda43ed0 【主界面】右上伸缩条调整 2021-05-26 11:16:27 +08:00
ZhangBiao f3cf294f42 【主界面】右上伸缩条首充引导调整,修行调整 2021-05-26 10:16:24 +08:00
ZhangBiao 9e6dc29cb9 【主界面】右上伸缩条红点 2021-05-25 21:08:48 +08:00
ZhangBiao d835687e8c 【主城】伸缩条调整 2021-05-25 18:33:26 +08:00
ZhangBiao d41ba9f65d 【主城】右侧伸缩条 2021-05-25 18:21:52 +08:00
ZhangBiao cecea9b415 【修行】主界面 修行提交 1 2021-05-25 10:16:07 +08:00
zhangqiang da17fb96ed 【主城修改】2 2021-05-20 20:32:04 +08:00
wangzhenxing e88f4d83d7 主城左滑箭头添加呼吸动画 2021-04-29 14:07:14 +08:00
wangzhenxing 4e61e39e53 主城 六星玉帝入口,16日登陆入口适配 2021-04-28 02:52:56 +08:00
wangzhenxing f936e4f8df Revert "主城左上角入口添加grid组件"
This reverts commit e1fb031c57.
2021-04-28 02:25:20 +08:00
wangzhenxing e1fb031c57 主城左上角入口添加grid组件 2021-04-28 00:50:47 +08:00
wangzhenxing d2a7fdcee1 天尊降世活动资源提交 2021-04-27 22:16:42 +08:00
wangzhenxing ebde6e43b0 [功能]========【ID1008784】 【活动优化】增加成长礼包入口跳转功能 2021-04-26 15:45:30 +08:00
wangzhenxing eff7ceb60c 【ID1008821】
【主界面优化】当右侧未显示区域入口按钮有红点提示时,主界面闪烁显示向右的箭头
2021-04-21 10:50:18 +08:00
gaoxin 196dfa34dd 【GM】添加红点数据查看工具 2021-04-09 16:14:24 +08:00
jiaoyangna 8291a48e73 Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
#	Assets/ManagedResources/Icon/ChengHao.meta
#	Assets/ManagedResources/Icon/ZuoQi.meta
#	Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/View/FetterItem.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-04-09 12:24:01 +08:00
gaoxin 500d54469d 【扫光】挂机,充值界面扫光光效添加 2021-04-08 18:16:28 +08:00
ZhangBiao d423390397 【十五日登录】特效+无尽副本编队问题 2021-04-07 20:27:56 +08:00
ZhangBiao 4c0150b7d9 【十五日登陆】导入特效资源 2021-04-02 16:04:57 +08:00
ZhangBiao d69d96a321 【十五日登陆】红点 2021-04-02 11:53:07 +08:00
ZhangBiao c1276ff0c4 【十五日登陆】界面 2021-03-31 17:00:35 +08:00
jiaoyangna 0494e55215 Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
2021-03-30 20:41:32 +08:00
jiaoyangna d860db875d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 18:19:12 +08:00
jiaoyangna 7d9a5a62ba 天书秘卷 提交 2021-03-30 18:18:16 +08:00
gaoxin 202658d6d9 【特权优化】将界面顶部的特权等级移回 2021-03-30 18:10:39 +08:00
jiaoyangna a0552233ae Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-03-30 16:15:49 +08:00
jiaoyangna e6ad1d141d mainpanel 提交 2021-03-30 13:56:50 +08:00
jiaoyangna ae51b547d5 活动提交 2021-03-30 10:48:34 +08:00
jiaoyangna 8aa411244e 灵兽秘卷修改提交 2021-03-25 16:21:34 +08:00
jiaoyangna 299a7ceff1 【天书秘卷】 修改 2021-03-25 15:34:05 +08:00
gaoxin 8644d27aaa 【界面优化】部分界面显示优化修改 2021-03-23 17:26:16 +08:00
jiaoyangna 298946dd2d Merge branch 'china/dev' into 0功能/天书秘卷
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-03-23 16:54:46 +08:00
jiaoyangna 3334257425 添加天书秘卷入口 2021-03-23 15:37:39 +08:00
gaoxin 671edf8366 【bug】修复充值界面在全面屏下文字显示不全的问题 2021-03-23 14:22:25 +08:00
ZhangBiao 83040f2c87 【主城】预设结构调整 2021-03-23 09:54:11 +08:00
ZhangBiao db3340d779 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 14:10:29 +08:00
ZhangBiao 97ae8966d7 【充值界面】 2021-03-18 14:10:23 +08:00
gaoxin 0f8f51eded 【bug】武将—>神将 2021-03-18 14:02:16 +08:00
zhangqiang f2b3df9721 【修改提交】 2021-03-17 17:27:53 +08:00