Commit Graph

615 Commits (2488d97ce623835b41d5d566f9df63fbf949f826)

Author SHA1 Message Date
wangzhenxing 49c3a298cf 【获取英雄】======预设修改提交 2022-06-07 11:06:32 +08:00
wangzhenxing 6bc4adee78 [英雄信息界面]=====背景修改 2022-06-06 15:43:15 +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 672402b37f 修改山河社稷图中【每日领取/购买】玉衡龙须丹弹窗的领取按钮背景 2022-04-28 16:58:43 +08:00
wangzhenxing 78bf3d5a7e 物品详情界面动画修改 2022-04-28 10:16:08 +08:00
yuanshuai 4199ea504a 查看其他玩家信息,变身卡信息不对bug 2022-04-26 17:20:19 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
luyao f620d95f5e 【tips背板】修改提交 2022-04-22 15:49:52 +08:00
wangzhenxing e4de85a120 tips背景修改,公用弹窗背景显示修改 2022-04-22 13:09:45 +08:00
luyao 4f28a4d4c3 tips界面更换背板 文字配色 2022-04-21 18:03:38 +08:00
jiaoyangna 7a1ccac3cd 【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
2022-04-02 14:45:12 +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 4252fde78f 【ID1011380】
装备和宝石属性修正

(cherry picked from commit 2f54afd172d5da2223cd5e5f8a5cc26b430985ae)
2022-03-30 13:40:37 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
张彪 d33dcb9f97 【装备】装备添加快捷入口到摘星阁 2022-03-02 14:15:13 +08:00
jiaoyangna d0720e17b2 【ID1011178】
至尊降世活动拉到1000档
2022-02-23 17:24:34 +08:00
gaoxin 2342bd8af8 【拍脸】寻仙招募拍脸添加 2022-02-23 18:08:50 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
jiaoyangna 76295739f3 【ID1019513】
【品质调整】神将技能弹窗,不关闭也可以点返回
2022-01-18 15:01:01 +08:00
wangzhenxing ff5866e00e [法宝详情]=======添加返回按钮 2022-01-18 11:57:38 +08:00
wangzhenxing 6be87dec74 Merge branch 'china/dev' into china/飞升 2022-01-17 11:00:42 +08:00
wangzhenxing 51d1f9e5a7 【图鉴】======图鉴列表界面预设修改 2022-01-17 10:58:36 +08:00
wangzhenxing a7ad2ee1f6 Merge branch 'china/dev' into china/飞升 2022-01-17 10:50:14 +08:00
ZhangBiao e93b2816b4 【摘星阁】装备摘星阁属性拆分 2022-01-17 10:24:27 +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
ZhangBiao 3ad8b6b6c3 【玩家信息】提交 2022-01-15 15:44:08 +08:00
ZhangBiao c373f8d014 【修改】提交 2022-01-15 15:05:26 +08:00
ZhangBiao fa1c832170 【坐骑】增加详细信息 2022-01-15 13:00:45 +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
ZhangBiao 8f554eca59 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-14 16:02:59 +08:00
ZhangBiao 28d3f421bc 【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交 2022-01-14 15:44:45 +08:00
jiaoyangna 053de388f2 神将修改提交 2022-01-14 14:52:56 +08:00
ZhangBiao 5b36346da3 【玩家信息】提交 2022-01-13 18:29:12 +08:00
ZhangBiao 36b475ee15 【玩家信息】增加额外属性 2022-01-13 15:23:59 +08:00
gaoxin 1c5736bbad 【动画】部分界面动画优化 2022-01-13 11:39:02 +08:00
jiaoyangna 40e37473dc 【ID1011029】
【优化】 神将界面优化
2022-01-11 11:09:44 +08:00
wangzhenxing e5c176cd9f [飞升]============特效显示修改提交 2022-01-07 10:08:55 +08:00
ZhangBiao 6b1c28a920 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2022-01-06 16:40:24 +08:00
ZhangBiao 4133605f55 【家园】引导提交 2022-01-06 15:28:41 +08:00
ZhangBiao aa761fc4e9 【家园】提交 2022-01-05 18:04:57 +08:00
ZhangBiao 27ead6dcff 【家园】提交 2021-12-31 16:30:53 +08:00
ZhangBiao cf9cbc5ac9 【家园】摘星阁装备属性加持+战斗力 2021-12-31 13:44:11 +08:00
ZhangBiao 85319e89f0 【家园】提交 2021-12-30 20:09:16 +08:00
ZhangBiao 8de1e4e596 【家园】资源提交 2021-12-30 19:02:52 +08:00
ZhangBiao 0f32a05956 【装备界面】增加摘星阁加持 2021-12-30 11:49:12 +08:00
jiaoyangna 7b67ef38df Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-12-30 11:43:22 +08:00
ZhangBiao 44aa663ab0 Merge branch 'china/dev' into 0功能/家园 2021-12-30 11:24:38 +08:00
ZhangBiao f148668636 【家园】提交 2021-12-30 11:00:27 +08:00
ZhangBiao 630d56c810 【家园】装备强化升级 2021-12-29 20:17:45 +08:00
gaoxin 26dc765925 【动画】物品信息动画修改 2021-12-31 00:36:36 +08:00
gaoxin e90f96705d 【动画】通用弹窗动画优化 2021-12-30 22:08:29 +08:00
gaoxin 5757b82777 【动画】三级弹窗,帮助界面动画优化 2021-12-30 22:08:06 +08:00
jiaoyangna 978689d9a7 探索提交 2021-12-28 17:52:28 +08:00
jiaoyangna 738333f924 预设冲突提交 2021-12-27 17:04:54 +08:00
jiaoyangna d83373ecab Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
#	Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpViewNew.lua
#	Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
2021-12-27 17:00:14 +08:00
jiaoyangna 7f0e684bc0 一键探索修改提交 2021-12-24 11:18:03 +08:00
ZhangBiao 078c3a1f96 Merge branch 'china/dev' into 0功能/家园 2021-12-23 17:48:20 +08:00
ZhangBiao 926e0a4fbd 【命石】一键合成修改 2021-12-23 16:17:35 +08:00
ZhangBiao c920c8d064 【家园】预设冲突提交 2021-12-23 14:53:14 +08:00
jiaoyangna 7bb3325c99 探索提交 2021-12-23 13:09:34 +08:00
ZhangBiao e6aa1d31fe Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
2021-12-23 09:43:06 +08:00
jiaoyangna d2271d89b6 探索提交 2021-12-22 12:07:00 +08:00
jiaoyangna d1fd74db04 【ID1019430】
【神将回退】光效穿透
2021-12-20 14:15:14 +08:00
ZhangBiao 745a9d1dae Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-20 14:07:56 +08:00
ZhangBiao df483145bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:13:57 +08:00
ZhangBiao a9b7c21fad 【道具弹窗】跳转按钮错位 2021-12-17 17:13:45 +08:00
jiaoyangna a16931b9dc 文字位置修改提交 2021-12-17 16:55:23 +08:00
jiaoyangna ffd7d0ecbe 超值返利修改提交 2021-12-17 16:41:08 +08:00
ZhangBiao 80d4df7add 【命格】冲突提交 2021-12-17 15:49:55 +08:00
ZhangBiao a197f16837 Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-12-17 15:46:53 +08:00
jiaoyangna 4fdd4e7b62 跳转修改提交 2021-12-17 13:29:08 +08:00
jiaoyangna 740aeac6bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 18:43:36 +08:00
gaoxin eaea265bc7 【物品】添加物品使用的限制等级 2021-12-26 17:35:50 +08:00
jiaoyangna c1f0e0f78b 添加选中框 2021-12-16 18:38:32 +08:00
jiaoyangna 1ae167efb5 至尊降世修改提交 2021-12-16 16:55:30 +08:00
jiaoyangna 11c4f914b5 至尊降世提交 2021-12-16 11:42:00 +08:00
jiaoyangna 73283bd818 回退修改提交 2021-12-16 10:09:48 +08:00
jiaoyangna c6eb719fa6 添加回退消耗数量 2021-12-15 14:41:04 +08:00
jiaoyangna 568ad92a9b 回退修改 2021-12-15 14:28:36 +08:00
jiaoyangna 0c83c3412e 【ID1010843】
增加英雄回退功能
2021-12-14 17:25:44 +08:00
ZhangBiao d91811a555 【命格】提交 2021-12-13 17:26:08 +08:00
ZhangBiao c11848b98a 【命格】红点提交 2021-12-10 18:27:43 +08:00
ZhangBiao 94c98be0e5 【命格】提交 2021-12-10 16:17:47 +08:00
ZhangBiao 982137c9b7 【命格】提交 2021-12-10 14:14:08 +08:00
ZhangBiao 82c89e5e7d 【命格】提交 2021-12-10 13:57:24 +08:00
ZhangBiao bab62f274c 【命格】提交 2021-12-10 11:01:44 +08:00
ZhangBiao cb5cf43089 【命格】提交 2021-12-09 20:17:37 +08:00
ZhangBiao 9875630085 【命格】提交 2021-12-09 13:29:16 +08:00
ZhangBiao 016780c7bc 【命格】命石替换 2021-12-08 14:17:18 +08:00
jiaoyangna 0c6ff17ddd 修改提交 2021-11-27 14:30:51 +08:00
jiaoyangna f6c94a3cfe 变身卡详情提交 2021-11-26 19:36:20 +08:00
ZhangBiao 7ef385ac53 【固定活动】提交 2021-11-26 10:34:41 +08:00
ZhangBiao fd97f584cb 【固定活动】调整 2021-11-25 18:51:36 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
ZhangBiao 95f71667fe 【灵脉秘境】提交 2021-11-19 17:23:06 +08:00
ZhangBiao c8d4cadb2b 【灵脉秘境】提交 2021-11-19 15:38:41 +08:00
ZhangBiao c9e465f662 【灵脉秘境】提交 2021-11-19 11:45:53 +08:00
ZhangBiao 2b2a77a129 【灵脉秘境】提交 2021-11-17 16:14:47 +08:00
ZhangBiao 21e1c0366c 【优化】神将情报界面优化 2021-11-11 15:08:13 +08:00
ZhangBiao cc316086e9 【新·物品】界面提交 2021-11-10 15:03:18 +08:00
ZhangBiao f74ce2f895 【新·物品】界面提交 2021-11-10 14:53:35 +08:00
ZhangBiao 7efdfd5029 【新·装备】增加战力对比图标 2021-11-09 18:24:38 +08:00
ZhangBiao c627c5cd28 【新·魂灵宝】增加战力对比图片 2021-11-09 17:35:27 +08:00
ZhangBiao aa9cc34792 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 17:06:59 +08:00
ZhangBiao f18880622e 【新·魂灵宝】提交 2021-11-09 17:06:47 +08:00
gaoxin f23a455797 【魂印】详情界面优化 2021-11-09 15:48:56 +08:00
ZhangBiao 76c3c5c0bf 【新·魂灵宝】提交 2021-11-09 14:39:27 +08:00
ZhangBiao fdffaf846e 【新·魂灵宝】界面提交 2021-11-09 11:42:19 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
jiaoyangna abf8548cc9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 11:14:14 +08:00
jiaoyangna b5eb09134f 特效修改提交 2021-11-08 11:13:42 +08:00
ZhangBiao 0fc2ec5b08 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 11:07:35 +08:00
ZhangBiao 2621f0f9f8 【升星有礼】白骨精进阶10星,获得的展示界面没有天赋详情 2021-11-08 11:07:11 +08:00
jiaoyangna 024b684999 排行榜神魂放大镜显示错误修改 2021-11-08 10:51:51 +08:00
ZhangBiao 3418bac21d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 18:09:46 +08:00
ZhangBiao 104f5cbda8 【降妖夺宝】修改提交 2021-11-05 18:09:14 +08:00
jiaoyangna bd8cd97bf3 神魂星星修改提交 2021-11-05 17:13:49 +08:00
jiaoyangna 2179a76560 森罗幻境,公会星星修改提交 2021-11-05 16:19:47 +08:00
jiaoyangna 5ac1f04718 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:18:28 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
ZhangBiao 08e6f334a4 【装备界面】特效调整 2021-11-04 19:10:06 +08:00
ZhangBiao 1321b32caf 【装备界面】增加特效 2021-11-04 15:44:59 +08:00
ZhangBiao dd0801e149 【界面优化】技能描述 2021-11-04 11:43:24 +08:00
ZhangBiao 4f19c5eaaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 11:30:20 +08:00
ZhangBiao 0aa460f151 【界面优化】技能具中 2021-11-04 11:30:10 +08:00
jiaoyangna 596c8477d3 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-04 09:29:56 +08:00
jiaoyangna 34d8cf4440 神魂位置提交 2021-11-04 09:27:56 +08:00
ZhangBiao 46247d8224 【界面优化】QA界面提交 2021-11-02 17:04:17 +08:00
ZhangBiao 7eb3eeb351 【道具来源】界面错位修改 2021-11-02 14:47:27 +08:00
ZhangBiao 0e5e559220 【界面优化】法宝归元 2021-11-02 13:52:48 +08:00
ZhangBiao 68525db92e 【界面优化】提交 2021-11-02 11:06:13 +08:00
ZhangBiao 16b65a6c8b 【神将来源】界面偏移修改 2021-11-02 10:27:48 +08:00
ZhangBiao 8a9d52656f 【界面优化】山河社稷图、仙缘汇聚箱 2021-11-02 09:29:07 +08:00
gaoxin 0c1044ab67 Revert "Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法""
This reverts commit d2c8daffce.
2021-11-01 18:59:21 +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
zhangshanxue d2c8daffce Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法"
This reverts commit 87210b9d73.
2021-11-01 18:53:39 +08:00
ZhangBiao 87210b9d73 【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法 2021-11-01 17:21:59 +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
jiaoyangna c735599c77 至尊降世报错修改提价 2021-10-29 12:05:01 +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
ZhangBiao 0903782f0e 【界面优化】法宝界面错位调整 2021-10-28 16:51:00 +08:00
ZhangBiao 79f7339a3a 【三界降魔】提交 2021-10-28 16:03:23 +08:00
ZhangBiao 87a95f0612 【界面优化】还原”特性“、大闹天宫 2021-10-28 14:14:30 +08:00
ZhangBiao ef79b1d170 【界面优化】送神、归元、法宝 2021-10-28 09:47:24 +08:00
jiaoyangna d4d9b88fe7 神魂修改提交 2021-10-27 15:24:46 +08:00
ZhangBiao 19a67875f8 【界面优化】大闹天宫部分 2021-10-27 13:45:05 +08:00
jiaoyangna d398c21668 神魂提交 2021-10-27 12:50:15 +08:00
ZhangBiao 2f8ad786f5 【界面优化】HelpPopup 2021-10-26 18:30:32 +08:00
ZhangBiao 490f566b4d 【界面优化】技能 2021-10-26 18:23:32 +08:00
ZhangBiao 779cb4d99e 【界面优化】技能 2021-10-26 18:18:36 +08:00
ZhangBiao d5cf1c5395 【界面优化】归元、技能 2021-10-26 17:55:49 +08:00
ZhangBiao 353a9774c5 【界面优化】定位、恭送 2021-10-26 17:36:08 +08:00
jiaoyangna edcdd0e81e Merge branch 'china/dev' into 0功能/神魂 2021-10-26 16:01:24 +08:00
ZhangBiao 26b5a670f9 【界面优化】背包装备优化 2021-10-26 14:04:02 +08:00
ZhangBiao 7332c761b8 【御剑行】错别字 2021-10-25 18:40:22 +08:00
gaoxin 102c24cd8e 【至尊降世】文字遮挡优化 2021-10-25 14:53:32 +08:00
ZhangBiao 60e71f5e42 【御剑行】哎,提交 2021-10-22 18:20:08 +08:00
ZhangBiao cc2cfd7a21 【百宝商会、御剑行】按钮一致性提交、显示修改 2021-10-22 18:15:55 +08:00
ZhangBiao de2ce6919c 【御剑行】提交 2021-10-22 17:58:07 +08:00
ZhangBiao 2bb589b5dd 【御剑行】竞猜界面点击任意位置关闭修改 2021-10-22 17:45:46 +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 22941d0af5 【弹窗优化】公会、公告、服务器列表】英雄信息 2021-10-22 13:53:10 +08:00
ZhangBiao 31e8f4c726 【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗 2021-10-22 13:22:39 +08:00
ZhangBiao e48606b648 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 11:21:53 +08:00
ZhangBiao 1215e46af8 【御剑行】点击商店返回后增加请求 2021-10-22 11:21:42 +08:00
jiaoyangna bfd2e06ecc 至尊降世修改提交 2021-10-22 11:20:24 +08:00
jiaoyangna 68cbb5905a 至尊降世修改提交 2021-10-21 18:58:36 +08:00
jiaoyangna 8fa8a9d690 至尊降世界面修改提交 2021-10-21 17:38:53 +08:00
ZhangBiao f75e42d9c9 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
2021-10-20 13:41:32 +08:00
jiaoyangna 7d1f1d7f01 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 11:17:27 +08:00
gaoxin e647486e07 【战斗】失败界面我要变强按钮资源修改-预设修改 2021-10-19 14:05:02 +08:00
jiaoyangna 005468635f 页签添加红点 2021-10-19 13:25:08 +08:00
jiaoyangna 1f077cbcdc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-19 11:04:25 +08:00
jiaoyangna c091c55bef 【ID1010437】
【优化】开服玉帝御剑坐骑活动
2021-10-19 11:04:06 +08:00
gaoxin a23791e07c 【战斗】失败界面添加我要变强跳转 2021-10-19 10:46:12 +08:00
ZhangBiao 67026aa355 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-10-14 16:13:07 +08:00
ZhangBiao 2101e974ad 【御剑行】增加投注滑动条 2021-10-14 09:53:51 +08:00
ZhangBiao bb9533781d 【御剑行】提交 2021-10-13 19:15:39 +08:00
jiaoyangna 60b53f2d7b 神将详情,装备修改提交 2021-10-12 15:32:07 +08:00
jiaoyangna e70329e605 神将详情显示错误修改 2021-10-12 14:54:12 +08:00
ZhangBiao f2b5f62ddd Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-10-09 11:00:18 +08:00
gaoxin 788d18e332 【装备对比】背包中的装备信息界面修改 2021-09-28 21:00:50 +08:00
ZhangBiao 422806200e 【御剑行】提交 2021-09-28 10:34:05 +08:00
ZhangBiao ea61fced0d 【御剑行】提交 2021-09-27 14:33:23 +08:00
ZhangBiao cdd6499fe8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 10:34:19 +08:00
ZhangBiao 0842438fdf 【装备分解】不可分解白金装备and增加mask点击 2021-09-27 10:34:03 +08:00
wangzhenxing e763b6472b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 17:31:16 +08:00
wangzhenxing a3e1782007 【功能】==========白金装备合成提交 2021-09-26 17:30:35 +08:00
gaoxin e61dea0f4a 【白金装备】套装显示添加 2021-09-26 17:13:12 +08:00
gaoxin b318ed5678 【资源】部分界面战力文字换成评分 2021-09-26 10:03:50 +08:00
ZhangBiao d0c38ec9d7 【七界试炼】提交 2021-09-23 19:47:17 +08:00
ZhangBiao 016f0159e5 【七界试炼】提交 2021-09-23 14:51:04 +08:00
ZhangBiao 5c11a67393 【七界试炼】修改提交 2021-09-23 12:01:58 +08:00
ZhangBiao c29ad91a4c 【七界试炼】修改提交 2021-09-22 19:56:13 +08:00