Commit Graph

2879 Commits (95382d530e02b279837c285fd2483acc34ed7f2a)

Author SHA1 Message Date
jiaoyangna 791ac14e2e 天宫寻宝特效修改提交 2021-11-16 17:27:49 +08:00
jiaoyangna 6e2deee6f1 【ID1019165】
【灵兽列表】部分星星显示位置错误

(cherry picked from commit a9709ad212)
2021-11-16 16:41:30 +08:00
jiaoyangna a9709ad212 【ID1019165】
【灵兽列表】部分星星显示位置错误
2021-11-16 16:40:34 +08:00
jiaoyangna 1e4a7a57be 法宝之魂 提交 2021-11-16 15:24:17 +08:00
wangzhenxing 1361867887 【坐骑】=======四不像提交 2021-11-16 13:31:28 +08:00
ZhangBiao d717519d93 【灵脉秘境】提交 2021-11-16 11:21:37 +08:00
jiaoyangna aa6a031fdf 法宝聚灵提交 2021-11-16 09:33:10 +08:00
jiaoyangna e6f4e50656 法宝聚灵 2021-11-15 18:24:39 +08:00
ZhangBiao ff3fcf3db9 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-15 09:56:59 +08:00
ZhangBiao 07a87548aa 【灵脉秘境】提交 2021-11-15 09:56:02 +08:00
gaoxin 83583747ad Merge branch '0功能/和谐资源后台控制' into china/dev 2021-11-12 16:39:53 +08:00
ZhangBiao c5a7206184 【灵脉秘境】提交 2021-11-11 17:53:47 +08:00
ZhangBiao 745cb6450c Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 15:09:24 +08:00
ZhangBiao 21e1c0366c 【优化】神将情报界面优化 2021-11-11 15:08:13 +08:00
ZhangBiao c37386fada 【优化】轩辕宝境界面优化 2021-11-11 14:59:15 +08:00
gaoxin 3addb9905b 【神将觉醒】觉醒成功界面中,不需要显示非核心天赋的变化(非特性天赋),且【特性】文字需要放大 2021-11-11 14:10:48 +08:00
gaoxin 9013148d1e 【玉虚论道】界面切边修改 2021-11-11 13:40:37 +08:00
jiaoyangna 278e309174 商店新字位置调整 2021-11-11 11:43:09 +08:00
ZhangBiao 3eca9bec47 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 10:11:04 +08:00
ZhangBiao c104bd65a7 【灵脉秘境】提交 2021-11-11 10:06:49 +08:00
gaoxin 20df877296 【btview】按钮顺序调整,主城,主角,神将,关卡,副本,背包,公会 2021-11-10 16:40:38 +08:00
ZhangBiao cc316086e9 【新·物品】界面提交 2021-11-10 15:03:18 +08:00
ZhangBiao f74ce2f895 【新·物品】界面提交 2021-11-10 14:53:35 +08:00
jiaoyangna 52475ee00b 跨服战预设黑条不显示开启条件修改 2021-11-10 08:29:19 +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
gaoxin 964f45b245 【资源】孟姜女不动 2021-11-09 10:28:26 +08:00
gaoxin 67da83d8b3 【资源】新和谐资源上传 2021-11-09 10:28:18 +08:00
gaoxin 37de3d19b0 【立绘】修复和谐资源不动的问题 2021-11-09 10:27:52 +08:00
ZhangBiao ed02f4a86f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 10:22:33 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
jiaoyangna 851e9c61be Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 10:04:36 +08:00
ZhangBiao ef4829639b 【森罗环境】点击框体退出修复 2021-11-08 18:10:08 +08:00
jiaoyangna 173221dd1a 【ID1010656】
【商店优化】魂印商店中,玩家尚未获得过的魂印上添加“新”标志
2021-11-08 17:22:51 +08:00
jiaoyangna 76895c45b4 巅峰赛星星被遮挡修改 2021-11-08 15:56:18 +08:00
jiaoyangna b8c763cbce 分割线修改提交 2021-11-08 15:32:54 +08:00
jiaoyangna 3f7dd0db96 大闹天宫选择助战界面星星修改提交 2021-11-08 15:21:41 +08:00
gaoxin 3dffd71924 【跨服战】优化打开跨服战界面,请求过多导致界面不可点击的问题 2021-11-08 14:49:26 +08:00
jiaoyangna e59b318e3d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 13:44:12 +08:00
jiaoyangna 016be8951e 神魂位置错误修改 2021-11-08 13:43:45 +08:00
gaoxin 085960b153 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 13:39:34 +08:00
gaoxin 67f3ca9f52 【适配】1080*2550,进阶白骨精法宝,文字描述遮挡 2021-11-08 13:39:29 +08:00
jiaoyangna 75d677d29e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 13:38:19 +08:00
jiaoyangna 45d4104f72 装备界面添加特效 2021-11-08 13:38:03 +08:00
gaoxin f81b35a309 【好感度详情】适配显示错误 2021-11-08 13:24:16 +08:00
ZhangBiao a577d80d76 【神魂】增加特效 2021-11-08 13:02:00 +08:00
jiaoyangna 1329112387 神魂未激活图片修改提交 2021-11-08 11:24:10 +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
jiaoyangna e8433d1026 玉虚论道记录神魂修改提交,神将界面修改提交 2021-11-08 10:30:12 +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 c8172c34a4 四灵试炼神魂修改提交 2021-11-05 18:06:01 +08:00
jiaoyangna afcfc1b393 神魂星星修改提交 2021-11-05 17:38:10 +08:00
jiaoyangna 2aea503619 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:14:08 +08:00
jiaoyangna bd8cd97bf3 神魂星星修改提交 2021-11-05 17:13:49 +08:00
ZhangBiao f91bd47007 【逍遥游】图标层级错误修改 2021-11-05 16:49:38 +08:00
ZhangBiao 142956ca6a 【活动】活动修改提交 2021-11-05 16:43:09 +08:00
ZhangBiao 05779f9926 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 16:33:41 +08:00
ZhangBiao e714209ba7 【界面修改】坐骑、白骨精法宝 2021-11-05 16:24:14 +08:00
jiaoyangna 2179a76560 森罗幻境,公会星星修改提交 2021-11-05 16:19:47 +08:00
jiaoyangna 1c2758f26c 送神祠星级修改 2021-11-05 15:48:22 +08:00
jiaoyangna f8b43c4c30 修行星星修改提交 2021-11-05 15:23:21 +08:00
jiaoyangna 057ec06b4c 协议修改提交 2021-11-05 15:14:00 +08:00
jiaoyangna 8740afa514 大脑天宫神魂星星修改 2021-11-05 15:02:33 +08:00
jiaoyangna 0bd44642dc 战斗结算界面星级修改 2021-11-05 14:44:10 +08:00
jiaoyangna 420356da83 添加特效 2021-11-05 14:33:09 +08:00
jiaoyangna e35ded2b5d 巅峰赛星级修改提交 2021-11-05 14:08:35 +08:00
jiaoyangna cdd6baeb5f 巅峰赛星星修改提交 2021-11-05 13:35:14 +08:00
jiaoyangna d0d93e02ea 代码星星层级设置修改 2021-11-05 13:18:55 +08:00
gaoxin 6b6d822603 【周卡】周卡数量显示位置优化 2021-11-05 11:27:48 +08:00
ZhangBiao 9e8d4b8d6d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 11:16:40 +08:00
ZhangBiao 7aa6cc1fda 【百宝商会】修改提交 2021-11-05 11:16:30 +08:00
gaoxin 2f65f4d391 【心魔试炼】界面报错修复 2021-11-05 11:06:10 +08:00
ZhangBiao ab6aa7dfbe 【优化】 百宝商会界面优化 2021-11-05 10:42:26 +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 4cb826b9e5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 19:10:24 +08:00
ZhangBiao 08e6f334a4 【装备界面】特效调整 2021-11-04 19:10:06 +08:00
gaoxin 671de83349 【天书密卷】修复返回按钮和页签遮挡问题 2021-11-04 18:10:18 +08:00
ZhangBiao 5f28703681 【法宝界面】法宝描述超框修改 2021-11-04 16:11:27 +08:00
ZhangBiao 1321b32caf 【装备界面】增加特效 2021-11-04 15:44:59 +08:00
gaoxin 761cdeffcf 【周卡】策划反馈优化 2021-11-15 00:03:12 +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
jiaoyangna 4941110a7b 神魂提交 2021-11-03 18:38:13 +08:00
jiaoyangna 6f0d51ddb2 神魂提交 2021-11-03 18:11:08 +08:00
ZhangBiao 38544fd273 【逍遥游】触发仙缘界面中,事件图标显示不对 2021-11-03 17:12:20 +08:00
jiaoyangna 358f9e13ba 底修改提交 2021-11-03 16:26:07 +08:00