Commit Graph

140 Commits (fd5cd6836c2469821c6b52f37cb0b6f766fa664c)

Author SHA1 Message Date
wangzhenxing 379fb97b98 英雄图鉴预设修改提交 2023-04-14 13:58:47 +08:00
yuanshuai a9a4d13fdf 删除log 2023-02-28 15:09:15 +08:00
yuanshuai cbfd2bd8ca 图鉴技能打印 2023-02-28 14:39:24 +08:00
wangzhenxing 4953aad743 图鉴星级显示修改 2023-01-05 17:12:24 +08:00
wangzhenxing 19ce8e51d5 英雄升星扩展 2022-11-03 14:33:09 +08:00
wangzhenxing 4ca74759ba [图鉴,英雄详情]======添加神魂按钮 2022-07-22 13:43:25 +08:00
wangzhenxing b791dc6d3d 【图鉴】======法宝按钮显示修改 2022-07-15 13:05:31 +08:00
wangzhenxing c382f44681 [英雄技能]======飞升技能显示修改 2022-06-13 16:35:30 +08:00
wangzhenxing a97ccb19e6 [图鉴]=====展示英雄法宝 2022-05-23 11:36:50 +08:00
wangzhenxing d1970ed6cc 他人英雄详情修改 2022-05-19 22:12:14 +08:00
wangzhenxing 5e27a00173 英雄技能详情修改 2022-05-19 21:33:38 +08:00
wangzhenxing d97c84a543 [英雄详情修改i] 2022-05-19 20:43:41 +08:00
wangzhenxing 3b4e771d16 [神将信息展示]======神将信息修改 2022-05-19 16:38:52 +08:00
wangzhenxing d3a8722b95 图鉴修改 2022-04-25 20:35:17 +08:00
gaoxin b6fa8db0cc 【图鉴】加入版本判断 2022-02-11 15:11:38 +08:00
wangzhenxing 01506ba48c [角色天赋]======角色天赋显示修改 2022-02-10 17:52:40 +08:00
wangzhenxing e5494e65ab [飞升]=====图鉴显示修改 2022-01-21 13:55:17 +08:00
wangzhenxing 7fd7ef19f3 [飞升]====卡牌背景修改 2022-01-19 17:50:39 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
wangzhenxing 4034a90a33 [飞升]======优化修改提交 2022-01-19 15:29:47 +08:00
wangzhenxing 4298209c33 [战斗]=======护盾buff修改 2022-01-18 11:44:36 +08:00
wangzhenxing a6e05ae8e8 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 09:53:04 +08:00
wangzhenxing 1de7293630 [飞升]======卡牌飞升预设修改 2022-01-17 16:53:26 +08:00
wangzhenxing f257bc2c6d [图鉴]=====图鉴神魂按钮显示修改 2022-01-17 14:26:17 +08:00
wangzhenxing 1d170dfd2d [图鉴]==========图鉴详情修改提交 2022-01-15 17:12:40 +08:00
wangzhenxing e8f8f5ca59 [图鉴]=====图鉴详情修改提交 2022-01-15 14:32:55 +08:00
wangzhenxing 05377b9595 [图鉴]==== 图鉴 图鉴详情界面修改 2022-01-14 18:49:49 +08:00
wangzhenxing 039f9a3deb [图鉴]======图鉴修改提交 2022-01-11 18:11:13 +08:00
gaoxin 0c9b3b4f96 【角色信息】修复回收立绘错误 2021-12-31 17:55:01 +08:00
gaoxin 17394f79a0 【动画】神将切换动画优化 2021-12-31 01:45:13 +08:00
wangzhenxing 6b742c0788 [立绘朝向]======皮肤立绘朝向修改 2021-11-30 20:43:56 +08:00
wangzhenxing 1eb6115bc9 [角色朝向]=======立绘朝向修改 2021-11-29 13:21:23 +08:00
wangzhenxing 3c22a1ef6c [立绘朝向]======静态立绘朝向改回原样 2021-11-27 13:17:36 +08:00
wangzhenxing 69e30d908c [立绘朝向]===============我方立绘展示朝向修改 2021-11-26 16:55:13 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
jiaoyangna 125e37fe6d 神魂提交 2021-11-03 10:13:44 +08:00
jiaoyangna 681f8d5a57 神魂提交 2021-11-01 19:11:59 +08:00
jiaoyangna 9f59cb3b64 神魂提交 2021-10-27 17:04:33 +08:00
jiaoyangna d398c21668 神魂提交 2021-10-27 12:50:15 +08:00
jiaoyangna 529094b6ad 好感度第一次提交 2021-09-22 20:47:13 +08:00
jiaoyangna 97de80b9cd 图鉴提交 2021-08-06 17:19:44 +08:00
jiaoyangna 522754669f 删除log 2021-07-29 11:31:30 +08:00
jiaoyangna 26ef0d21d0 图鉴神将来源修改提交 2021-07-02 10:16:12 +08:00
jiaoyangna b27430089a 【神将图鉴】猪八戒首次打开界面显示错误,报错(非必现) 2021-06-03 18:46:49 +08:00
jiaoyangna 6777d87a72 图鉴隐藏皮肤 2021-06-03 18:00:28 +08:00
jiaoyangna 9b13236cfc 添加限制皮肤显示 2021-06-03 10:59:54 +08:00
gaoxin 1b873eb38d Merge branch 'china/dev-c' into china/ios
# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
2021-05-19 14:12:37 +08:00
ZhangBiao 7d63d1e191 【修行】提交 2021-05-12 17:40:38 +08:00
ZhangBiao 92b22fdc0c 【修行】提交 2021-05-12 10:35:58 +08:00
gaoxin b4834ba2cc 【图鉴】信息界面定位按钮走表配置 2021-05-10 10:57:06 +08:00