ZhangBiao
|
68525db92e
|
【界面优化】提交
|
2021-11-02 11:06:13 +08:00 |
jiaoyangna
|
681f8d5a57
|
神魂提交
|
2021-11-01 19:11:59 +08:00 |
gaoxin
|
5044a79789
|
Revert "Revert "【界面优化】心魔试炼、战斗统计、法宝进阶""
This reverts commit 2901a60489.
|
2021-11-01 18:59:11 +08:00 |
zhangshanxue
|
2901a60489
|
Revert "【界面优化】心魔试炼、战斗统计、法宝进阶"
This reverts commit 75827dc392.
|
2021-11-01 18:53:54 +08:00 |
ZhangBiao
|
75827dc392
|
【界面优化】心魔试炼、战斗统计、法宝进阶
|
2021-11-01 15:36:40 +08:00 |
jiaoyangna
|
766710dc6b
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-29 13:25:35 +08:00 |
ZhangBiao
|
c1f3658da4
|
【界面优化】提交
|
2021-10-29 11:13:29 +08:00 |
jiaoyangna
|
ec3cee0ebb
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_sbx.png.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-28 16:52:28 +08:00 |
jiaoyangna
|
9249ed85cb
|
神魂预设修改
|
2021-10-28 16:19:59 +08:00 |
jiaoyangna
|
f4d9f0487d
|
神魂
|
2021-10-28 15:30:47 +08:00 |
ZhangBiao
|
87a95f0612
|
【界面优化】还原”特性“、大闹天宫
|
2021-10-28 14:14:30 +08:00 |
ZhangBiao
|
ef79b1d170
|
【界面优化】送神、归元、法宝
|
2021-10-28 09:47:24 +08:00 |
jiaoyangna
|
9f59cb3b64
|
神魂提交
|
2021-10-27 17:04:33 +08:00 |
jiaoyangna
|
d4d9b88fe7
|
神魂修改提交
|
2021-10-27 15:24:46 +08:00 |
jiaoyangna
|
d398c21668
|
神魂提交
|
2021-10-27 12:50:15 +08:00 |
ZhangBiao
|
f8a0a76d75
|
【界面优化】灵兽技能、英雄传说
|
2021-10-27 09:54:42 +08:00 |
ZhangBiao
|
353a9774c5
|
【界面优化】定位、恭送
|
2021-10-26 17:36:08 +08:00 |
ZhangBiao
|
e29dd36c26
|
【界面优化】法宝界面
|
2021-10-26 16:33:20 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
jiaoyangna
|
acc912a0e7
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
|
2021-10-22 15:52:33 +08:00 |
jiaoyangna
|
f5dc4a20b2
|
神魂出版提交
|
2021-10-22 15:47:59 +08:00 |
ZhangBiao
|
1f5f4f15c3
|
【弹窗优化】提交
|
2021-10-22 14:22:12 +08:00 |
jiaoyangna
|
06a8251a40
|
神魂界面提交
|
2021-10-20 18:02:09 +08:00 |
jiaoyangna
|
b50e5ee2bf
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zn01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-18 10:38:49 +08:00 |
jiaoyangna
|
097d5cf1cc
|
神魂初版提交
|
2021-10-18 10:36:32 +08:00 |
ZhangBiao
|
7e5f122a11
|
【适配】1080*2550 觉醒成功界面文字被切
|
2021-10-16 13:54:50 +08:00 |
jiaoyangna
|
9e46ffd910
|
神将天赋界面修改提交
|
2021-10-14 17:14:51 +08:00 |
jiaoyangna
|
491c04b2a3
|
装备套装属性预设修改提交
|
2021-10-08 12:14:48 +08:00 |
gaoxin
|
2eb04261bc
|
Merge branch '0优化/装备对比' into china/dev
|
2021-09-30 15:01:40 +08:00 |
gaoxin
|
4d907f1530
|
【装备界面优化】移除替换装备和宝物时上方的当前装备/宝物信息
|
2021-09-30 15:01:19 +08:00 |
gaoxin
|
e56affc4b4
|
【装备对比】装备穿戴界面显示修改
|
2021-09-28 19:45:21 +08:00 |
jiaoyangna
|
c242b86dd2
|
好感度详情提交
|
2021-09-28 18:23:37 +08:00 |
jiaoyangna
|
33acb35f82
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-09-28 09:52:22 +08:00 |
jiaoyangna
|
a3a8e8c2a7
|
预设修改提交
|
2021-09-27 21:53:04 +08:00 |
jiaoyangna
|
6de82cb731
|
好感度tips 提交
|
2021-09-27 21:35:55 +08:00 |
wangzhenxing
|
70ebab2fe1
|
【功能】====装备合成添加特效
|
2021-09-27 16:25:20 +08:00 |
jiaoyangna
|
1d1e21a9e7
|
属性格式修改提交
|
2021-09-27 15:45:23 +08:00 |
jiaoyangna
|
3a5e3cf17e
|
好感度提交
|
2021-09-26 21:32:04 +08:00 |
jiaoyangna
|
d39ef472dc
|
好感度提交
|
2021-09-26 20:23:08 +08:00 |
gaoxin
|
f282fe046b
|
【白金装备】修改白金装备字体显示
|
2021-09-26 18:41:47 +08:00 |
gaoxin
|
e61dea0f4a
|
【白金装备】套装显示添加
|
2021-09-26 17:13:12 +08:00 |
jiaoyangna
|
e59f160387
|
好感度等级修改提交
|
2021-09-26 13:55:57 +08:00 |
jiaoyangna
|
14b967185b
|
好感度提交
|
2021-09-26 10:18:51 +08:00 |
gaoxin
|
cc68282fb8
|
【法宝升阶】修复战力提升文字显示错误
|
2021-09-26 10:16:00 +08:00 |
gaoxin
|
b318ed5678
|
【资源】部分界面战力文字换成评分
|
2021-09-26 10:03:50 +08:00 |
jiaoyangna
|
1152586ff1
|
好感度提交
|
2021-09-26 09:54:58 +08:00 |
jiaoyangna
|
a8eeec83f6
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
|
2021-09-22 20:53:08 +08:00 |
jiaoyangna
|
529094b6ad
|
好感度第一次提交
|
2021-09-22 20:47:13 +08:00 |
jiaoyangna
|
80c4f8cd23
|
【ID1018487】
【鸿蒙阵】共鸣的装备和宝物不显示共鸣的箭头
|
2021-09-17 13:34:15 +08:00 |
ZhangBiao
|
1de0eda8bd
|
【适配】觉醒1080*2550左下角“等级上限”文字被切
|
2021-09-13 20:02:05 +08:00 |
jiaoyangna
|
186b2ca0c3
|
四灵修改提交
|
2021-09-02 16:09:04 +08:00 |
jiaoyangna
|
88f88d1249
|
适配修改提交
|
2021-09-02 11:20:18 +08:00 |
jiaoyangna
|
9ab223d577
|
【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
|
2021-09-01 19:20:34 +08:00 |
jiaoyangna
|
ae71f6941d
|
四灵修改提交
|
2021-09-01 18:10:51 +08:00 |
jiaoyangna
|
3372e2a965
|
已激活属性之间的空隙过大
|
2021-09-01 14:49:58 +08:00 |
jiaoyangna
|
a12c9330c7
|
四灵第二次修改提交
|
2021-09-01 10:08:25 +08:00 |
jiaoyangna
|
56af6f1a11
|
第一次bug修改提交
|
2021-08-31 20:22:59 +08:00 |
jiaoyangna
|
d9bef4f49a
|
战力修改提交
|
2021-08-31 18:08:57 +08:00 |
jiaoyangna
|
ac22bd000b
|
装备宝物界面修改提交
|
2021-08-31 17:02:22 +08:00 |
jiaoyangna
|
4801852d88
|
神应修改提交
|
2021-08-30 18:09:06 +08:00 |
jiaoyangna
|
2fbe372c76
|
四灵修改提交
|
2021-08-27 18:39:45 +08:00 |
ZhangBiao
|
17afa71bd2
|
【修行】预览调整 【魂灵宝】属性调整
|
2021-08-13 14:06:35 +08:00 |
ZhangBiao
|
e672b2644a
|
【魂灵宝】装备界面魂灵宝信息界面修改
|
2021-08-12 17:38:24 +08:00 |
jiaoyangna
|
2ecffb1b10
|
宝物培养位置修改
|
2021-07-30 17:58:47 +08:00 |
jiaoyangna
|
06829b685e
|
【ID1017646】
【适配】1080*2550 屏幕显示不全
|
2021-07-30 15:29:40 +08:00 |
jiaoyangna
|
c6c11c9374
|
宝物消耗震动修改
|
2021-07-30 15:11:56 +08:00 |
jiaoyangna
|
c81dbd604d
|
删除宝器的点击事件
|
2021-07-30 11:35:06 +08:00 |
jiaoyangna
|
7ee1ef9910
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity5.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
# Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
|
2021-07-28 17:45:59 +08:00 |
jiaoyangna
|
55c839dcd0
|
Revert "Revert "红点修改提交""
This reverts commit d53776b558.
|
2021-07-28 16:59:07 +08:00 |
jiaoyangna
|
7ac8f03cd3
|
Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9.
|
2021-07-28 16:58:52 +08:00 |
jiaoyangna
|
ab7c586a90
|
Revert "Revert "装备界面改动""
This reverts commit 9a1d361c63.
|
2021-07-28 16:58:44 +08:00 |
jiaoyangna
|
93a9473184
|
红点修改提交
|
2021-07-28 16:52:41 +08:00 |
ZhangBiao
|
87e8496df0
|
【适配】优化神将升星提示在长屏手机的适配效果
|
2021-07-28 14:49:21 +08:00 |
jiaoyangna
|
eea24f126e
|
红点添加
|
2021-07-28 13:49:04 +08:00 |
jiaoyangna
|
1123d9dc2d
|
宝物修改提交
|
2021-07-28 11:52:47 +08:00 |
jiaoyangna
|
527295f30c
|
宝物优化
|
2021-07-28 10:51:39 +08:00 |
jiaoyangna
|
d1845618d1
|
宝物可强化时,TIPS上的【强化】按钮未显示红点,精炼功能有相同问题
|
2021-07-27 18:53:36 +08:00 |
jiaoyangna
|
94c92a7f22
|
拥有可替换/战斗力较高的宝物时,应在宝物图标右上角,及下方的魂宝/灵宝按钮上显示红点,不应当在魂宝/灵宝装备格子上显示红点
|
2021-07-27 18:34:37 +08:00 |
jiaoyangna
|
917662ff20
|
宝物培养红点提交
|
2021-07-26 17:16:29 +08:00 |
jiaoyangna
|
734efe7b52
|
红点修改提交
|
2021-07-24 19:36:34 +08:00 |
jiaoyangna
|
bcd0651029
|
宝物培养修改提交
|
2021-07-23 19:12:42 +08:00 |
jiaoyangna
|
c131d41d58
|
装备界面改动
|
2021-07-21 18:27:03 +08:00 |
DESKTOP-98AVA47\Administrator
|
7eb776f699
|
【ID1009829】
升星界面的进阶要求改成进阶预览
|
2021-07-15 18:23:17 +08:00 |
jiaoyangna
|
ee344a1a39
|
神将界面切换遮罩修改
(cherry picked from commit 513cd35d5c)
|
2021-07-09 18:38:15 +08:00 |
jiaoyangna
|
37b7071ccf
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-29 20:05:15 +08:00 |
jiaoyangna
|
27bfb84fb5
|
问号大小修改提交
|
2021-06-16 15:29:29 +08:00 |
jiaoyangna
|
0bfea18692
|
问号大小修改
|
2021-06-16 15:25:48 +08:00 |
jiaoyangna
|
c5ecf50429
|
修改问号位置
|
2021-06-16 15:12:05 +08:00 |
jiaoyangna
|
b83e8902d7
|
【ID1009368】
添加升星预览功能
|
2021-06-16 11:16:41 +08:00 |
ZhangBiao
|
41152acae9
|
【修行】排行榜界面,神将界面、神将替换提示调整
|
2021-05-25 11:54:19 +08:00 |
ZhangBiao
|
b88957bcad
|
【修行】神将增加神印显示
|
2021-05-18 20:04:52 +08:00 |
gaoxin
|
7df1514da8
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
|
2021-04-26 17:55:43 +08:00 |
zhangqiang
|
1a76599139
|
【神将情报】界面的神将属性放大镜点击无弹窗,没反应
|
2021-04-21 20:18:13 +08:00 |
zhangqiang
|
d7a74e8256
|
【归元优化】确认归元弹窗的神将头像改为固定显示在左侧第一位
|
2021-04-20 11:43:24 +08:00 |
zhangqiang
|
3fb2bae218
|
英雄左右快速切换 ui 重叠
|
2021-04-19 19:36:43 +08:00 |
jiaoyangna
|
c844a72609
|
【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空
|
2021-04-15 19:54:30 +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 |
jiaoyangna
|
5740120f53
|
【ID1008675】
【图鉴优化】增加神将皮肤预览
|
2021-04-08 17:24:36 +08:00 |
zhangqiang
|
b05c9a8c1c
|
【bug】 十绝阵翻译修改引用
|
2021-04-07 11:43:25 +08:00 |
jiaoyangna
|
db80db31c2
|
升星神将显示名字修改
|
2021-04-06 16:44:04 +08:00 |