Commit Graph

310 Commits (99243d3f40950c8d10a39fe73f00d8b7d164a27d)

Author SHA1 Message Date
dengdan dcff772716 修改部分系统的按钮样式 2022-11-30 21:51:06 +08:00
yuanshuai 617d292b47 英雄一键升级 2022-11-15 16:35:48 +08:00
wangzhenxing f0eb2a75ab 好感度修改提交 2022-11-10 15:37:34 +08:00
yuanshuai 573ea577ce 建木神树修改提交 2022-09-06 10:16:57 +08:00
yuanshuai a10a386b24 法宝修改提交 2022-08-30 15:55:37 +08:00
wangzhenxing 4ca74759ba [图鉴,英雄详情]======添加神魂按钮 2022-07-22 13:43:25 +08:00
wangzhenxing 86eb8ab054 [英雄信息界面]======文字颜色修改 2022-06-06 10:55:28 +08:00
wangzhenxing 504da04293 [英雄信息界面]=======底图修改 2022-06-06 10:52:55 +08:00
wangzhenxing 2b75be487d 天赋按钮位置图片修改 2022-05-19 22:37:52 +08:00
wangzhenxing 5e27a00173 英雄技能详情修改 2022-05-19 21:33:38 +08:00
wangzhenxing a368bfa790 英雄主界面位置调整 2022-05-19 21:00:00 +08:00
wangzhenxing d97c84a543 [英雄详情修改i] 2022-05-19 20:43:41 +08:00
wangzhenxing 3b4e771d16 [神将信息展示]======神将信息修改 2022-05-19 16:38:52 +08:00
wangzhenxing d4a6bfdda2 【神将排版优化】========神将信息界面修改 2022-05-18 20:00:57 +08:00
luyao f353cc18eb 祭品神将选择。【一键选择】、【选定】按钮背景更换 2022-04-28 19:57:15 +08:00
wangzhenxing 4b9d210499 屏蔽神阵营,屏蔽招募 2022-04-25 11:31:32 +08:00
wangzhenxing 043f174f08 神印开始条件显示 2022-04-24 17:19:34 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
wangzhenxing eff2800c35 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-31 09:51:26 +08:00
jiaoyangna 857a23aea8 【ID1011391】
飞升鸿蒙阵等级限制调整

(cherry picked from commit 7dc728ef802a75a0d5d0c67907429f43c01befde)
2022-03-29 16:26:06 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
jiaoyangna 3ccf3c29a3 ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
2022-02-21 18:36:21 +08:00
jiaoyangna a76616df31 【ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
2022-02-17 15:13:26 +08:00
wangzhenxing e21fec89ac [图鉴]===============图鉴角色信息面板预设修改 2022-02-08 17:30:52 +08:00
wangzhenxing 7de5fdac9e [飞升]=====特效问题修改 2022-01-20 17:58:57 +08:00
wangzhenxing 46f337312e [飞升]========特效修改 2022-01-20 15:06:04 +08:00
ZhangBiao 908cee1961 【神将信息】图鉴信息便宜修改 2022-01-19 18:30:09 +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 7f9868ca59 [bug]=====奖池预览修改,图鉴详情添加点击反馈 2022-01-18 10:45:39 +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 2e0bd1ded7 [飞升]=======显示修改 2022-01-18 09:47:38 +08:00
gaoxin b7055edd5e 【图鉴】神将信息屏幕适配修改 2022-01-17 16:08:52 +08:00
wangzhenxing f257bc2c6d [图鉴]=====图鉴神魂按钮显示修改 2022-01-17 14:26:17 +08:00
wangzhenxing a7ad2ee1f6 Merge branch 'china/dev' into china/飞升 2022-01-17 10:50:14 +08:00
wangzhenxing 082afa8466 【飞升】=====角色主界面修改 2022-01-17 10:47:15 +08:00
wangzhenxing 21e77fe60b [图鉴]=======图鉴详情预设修改 2022-01-17 10:45:42 +08:00
wangzhenxing 9357e70d42 [角色信息]======名字位置修改 2022-01-15 18:44:08 +08:00
wangzhenxing 0b3007a9c7 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-15 18:16:56 +08:00
wangzhenxing 1d170dfd2d [图鉴]==========图鉴详情修改提交 2022-01-15 17:12:40 +08:00
wangzhenxing ef0a0ff436 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2022-01-15 12:47:22 +08:00
wangzhenxing 853fde91b2 [飞升]============飞升修改提交 2022-01-15 12:26:12 +08:00
jiaoyangna 9f5addf443 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 19:14:04 +08:00
jiaoyangna 98f23e56ea 神将修改提交 2022-01-14 19:13:46 +08:00
wangzhenxing c2c9eda981 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 18:50:17 +08:00
wangzhenxing 05377b9595 [图鉴]==== 图鉴 图鉴详情界面修改 2022-01-14 18:49:49 +08:00
jiaoyangna b0611db595 神将技能修改提交 2022-01-14 18:48:23 +08:00
jiaoyangna ea69ec6643 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 17:59:05 +08:00
jiaoyangna 81ce84e7be 升级修改提交 2022-01-14 17:57:12 +08:00