Commit Graph

10975 Commits (91ace072a26955372ad934d12744a6763ae6aefa)

Author SHA1 Message Date
jiaoyangna bd5d09def0 【ID1011132】
【活动优化】每日豪礼
2022-02-10 16:49:21 +08:00
wangzhenxing 599ef2e0fc [战斗]=========被动356 422 技能: 108修改 2022-02-10 15:29:24 +08:00
jiaoyangna 8d196f6759 天地洪炉心愿修改提交 2022-02-08 17:50:09 +08:00
wangzhenxing e21fec89ac [图鉴]===============图鉴角色信息面板预设修改 2022-02-08 17:30:52 +08:00
张彪 7f6cb1a40f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-08 14:07:03 +08:00
张彪 e257033ea6 【天地洪炉】增加白金品质宝物碎片 2022-02-08 14:06:25 +08:00
gaoxin 2704959c15 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-08 13:58:58 +08:00
jiaoyangna b28899db3f 神将置换星级设置报错修改提交 2022-02-08 13:40:25 +08:00
gaoxin 4ff738d8a2 【事件上报】修改区服字段上报内容为账号id 2022-02-08 11:02:21 +08:00
lihaiyang d8466e0676 【资源】====修行主角技能图片 2022-02-03 14:47:01 +08:00
gaoxin 62a9cda5d3 【战斗】修复姑获鸟神魂五对所有人生效的问题 2022-01-27 13:21:07 +08:00
gaoxin 1e26aad156 【逍遥游】数据打印添加 2022-01-26 16:01:45 +08:00
张彪 1f248db5f0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-26 13:40:20 +08:00
张彪 1597c0b657 【特权商城】无法购买最后i一个名望礼包,修改 2022-01-26 13:40:13 +08:00
wangzhenxing 4af86c7e7f 【战斗】=====御甲初始化数值修改 2022-01-26 13:29:39 +08:00
wangzhenxing 7d3e8fd73d [紫府神印]======紫府神印报错修改 2022-01-26 10:29:59 +08:00
张彪 432c92dcf0 【超值基金】提交 2022-01-24 18:41:18 +08:00
张彪 017cd79c09 【超值基金】提交 2022-01-24 18:11:06 +08:00
张彪 e7b9c54c45 【超值基金】提交 2022-01-24 18:09:14 +08:00
张彪 8e85780697 【超值寂静】提交 2022-01-24 18:03:04 +08:00
张彪 92d47074a4 【超值基金】提交 2022-01-24 17:31:40 +08:00
张彪 d1bb3391ac 【超值基金】提交 2022-01-24 17:09:55 +08:00
gaoxin be2fca6434 【资源】热更资源过大优化 2022-01-24 16:52:54 +08:00
wangzhenxing 9e73d667a2 [战斗]========加御甲显示修改 2022-01-24 16:20:07 +08:00
jiaoyangna 5eca555299 浮生门按钮层级修改提交 2022-01-24 16:07:21 +08:00
jiaoyangna 8a61d2b20d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-24 11:23:43 +08:00
jiaoyangna 087e83bce7 【ID1019501】
【探索】进入地图后,小人显示有血,原地晃
2022-01-24 11:23:19 +08:00
gaoxin 1548abda69 【资源】资源名重复修正 2022-01-24 11:16:52 +08:00
jiaoyangna 775c0a54bc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-24 10:48:53 +08:00
jiaoyangna dd2c4a8eb6 达人活动报错修改 2022-01-24 10:48:29 +08:00
wangzhenxing 0a51ced090 [飞升]=====大脑天宫特效修改 2022-01-22 17:08:17 +08:00
jiaoyangna 4bd7512ade 节日修改提交 2022-01-22 16:05:55 +08:00
jiaoyangna 9d755a2c1d 可以领取时点击事件修改 2022-01-22 15:54:30 +08:00
jiaoyangna 0fea3d1fd4 节日修改提交 2022-01-22 14:37:01 +08:00
jiaoyangna 911ef94fb1 跨天红点刷新修改 2022-01-22 14:00:01 +08:00
jiaoyangna e3a44ff121 适配修改提交 2022-01-22 13:50:21 +08:00
jiaoyangna a44233c365 节日提交 2022-01-22 13:34:19 +08:00
jiaoyangna ec7be4c020 节日提交 2022-01-22 13:27:25 +08:00
jiaoyangna 5cea36a143 节日修改提交 2022-01-22 11:37:59 +08:00
jiaoyangna 227e0f68c1 特效提交 2022-01-22 11:12:47 +08:00
ZhangBiao 6e10183d80 【命格】命石合成显示调整 2022-01-22 10:13:43 +08:00
jiaoyangna 11c46c594d 资源提交 2022-01-21 18:49:57 +08:00
jiaoyangna 3a9acbdf19 签到好礼提交 2022-01-21 18:49:40 +08:00
wangzhenxing b18db8765d [飞升]=====飞升特效修改提交 2022-01-21 17:09:14 +08:00
jiaoyangna 1f4c38a710 显示修改 2022-01-21 14:27:07 +08:00
jiaoyangna 937ca23dc0 探索提交 2022-01-21 14:06:30 +08:00
wangzhenxing e5494e65ab [飞升]=====图鉴显示修改 2022-01-21 13:55:17 +08:00
gaoxin 4c00b471ad 【战斗】添加头像显示 2022-01-21 11:59:19 +08:00
wangzhenxing ecc7e155a0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-20 18:21:58 +08:00
jiaoyangna a2b9a69126 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-20 18:19:04 +08:00
wangzhenxing b64234bcb8 [飞升]=====特效修改提交 2022-01-20 18:18:40 +08:00
jiaoyangna 676f03e79f 众志成城提交 2022-01-20 18:18:24 +08:00
ZhangBiao 68c9886183 【家园】特权升级提示错误修改 2022-01-20 18:11:28 +08:00
wangzhenxing 7de5fdac9e [飞升]=====特效问题修改 2022-01-20 17:58:57 +08:00
gaoxin 69a1e5bca6 【公会成员信息界面修改】 2022-01-20 17:50:35 +08:00
jiaoyangna e0b376135c 协议提交 2022-01-20 16:19:13 +08:00
jiaoyangna 90c21e5a73 协议提交 2022-01-20 16:17:26 +08:00
jiaoyangna 039f212694 Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-20 15:32:17 +08:00
wangzhenxing 46f337312e [飞升]========特效修改 2022-01-20 15:06:04 +08:00
jiaoyangna 9a96a31b14 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-20 12:20:47 +08:00
ZhangBiao 6ff00013f5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-20 11:55:01 +08:00
ZhangBiao 7d5c79b514 【排行榜】卡动画修改 2022-01-20 11:52:26 +08:00
jiaoyangna 70d3d943a8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-20 11:42:25 +08:00
wangzhenxing e734c4a03d [飞升]=======飞升修改 2022-01-20 11:41:20 +08:00
jiaoyangna 1c24a85612 添加红点 2022-01-20 11:22:39 +08:00
wangzhenxing f40c997a4f [飞升]======飞升特效修改 2022-01-20 10:09:57 +08:00
wangzhenxing 9831008684 [飞升]======飞升特效适配 2022-01-19 18:34:35 +08:00
gaoxin 5a66722aed 【无尽副本】优化清除缓存第一次进入无尽副本时任务状态错误 2022-01-19 18:32:43 +08:00
ZhangBiao 908cee1961 【神将信息】图鉴信息便宜修改 2022-01-19 18:30:09 +08:00
wangzhenxing 7fd7ef19f3 [飞升]====卡牌背景修改 2022-01-19 17:50:39 +08:00
jiaoyangna a797e80b39 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-19 17:47:28 +08:00
jiaoyangna a544abe9cc 众志成城 2022-01-19 17:47:07 +08:00
wangzhenxing 73ccdca2aa [飞升]=====资源提交 2022-01-19 17:22:30 +08:00
wangzhenxing 6ef00a4498 [飞升]=====细节调整 2022-01-19 16:57:17 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
jiaoyangna c7bc81f19f 协议提交 2022-01-19 15:57:01 +08:00
wangzhenxing 0fd8ea0add [飞升]=======特效资源提交 2022-01-19 15:36:17 +08:00
wangzhenxing 4034a90a33 [飞升]======优化修改提交 2022-01-19 15:29:47 +08:00
gaoxin 35648e8762 【升级】长按升到最大级了,会无法触发抬起事件,导致升级失败 2022-01-19 15:22:11 +08:00
ZhangBiao 60df01190d 【家园】资源替换 2022-01-18 15:19:19 +08:00
gaoxin 155dabe7c7 【专属升星】选择神将界面打不开 2022-01-18 15:07:14 +08:00
jiaoyangna 76295739f3 【ID1019513】
【品质调整】神将技能弹窗,不关闭也可以点返回
2022-01-18 15:01:01 +08:00
jiaoyangna b5cc0635ae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 14:49:50 +08:00
jiaoyangna ac24c2e0ce 【ID1010998】
【春节活动】签到领奖活动
2022-01-18 14:48:27 +08:00
ZhangBiao 54aeaa2ea8 【寻仙招募】提交 2022-01-18 12:09:43 +08:00
wangzhenxing ff5866e00e [法宝详情]=======添加返回按钮 2022-01-18 11:57:38 +08:00
wangzhenxing 4298209c33 [战斗]=======护盾buff修改 2022-01-18 11:44:36 +08:00
gaoxin 925db190ee 【引导】修复挂机界面打开时触发引导小手不消失的问题 2022-01-18 11:38:00 +08:00
ZhangBiao 558bbfdee1 【鸿蒙阵】报错提交 2022-01-18 11:20:55 +08:00
ZhangBiao 4d7c72725a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-18 10:57:09 +08:00
ZhangBiao 6283677b8f 【诸多修改】提交 2022-01-18 10:53:25 +08:00
wangzhenxing 7f9868ca59 [bug]=====奖池预览修改,图鉴详情添加点击反馈 2022-01-18 10:45:39 +08:00
ZhangBiao fc318e7d44 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-18 10:19:50 +08:00
ZhangBiao b316eccd7c 【装备】摘星阁属性 2022-01-18 10:19: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 2e0bd1ded7 [飞升]=======显示修改 2022-01-18 09:47:38 +08:00
gaoxin 0456081d65 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 18:27:24 +08:00
gaoxin a44c0cffab 【资源】临时技能图标优化 2022-01-17 18:27:10 +08:00
ZhangBiao f20f722177 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 18:24:12 +08:00
ZhangBiao bf3ca7ef08 【装备加持】鸿蒙阵共鸣出的装备未受到装备加持加成 2022-01-17 18:22:45 +08:00
wangzhenxing 1de7293630 [飞升]======卡牌飞升预设修改 2022-01-17 16:53:26 +08:00
gaoxin b7055edd5e 【图鉴】神将信息屏幕适配修改 2022-01-17 16:08:52 +08:00
wangzhenxing d5fd95373f [抽卡奖池]======抽卡奖池预览修改 2022-01-17 15:56:27 +08:00
wangzhenxing ea10cd65d1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 14:26:54 +08:00
ZhangBiao 369f7aa1ef 【点将台】选择心愿神将,列表动画不正常 2022-01-17 14:26:17 +08:00
wangzhenxing f257bc2c6d [图鉴]=====图鉴神魂按钮显示修改 2022-01-17 14:26:17 +08:00
ZhangBiao ae020064ab Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 14:10:19 +08:00
ZhangBiao 4e00c5e9c3 【名望礼包】红点 2022-01-17 14:10:08 +08:00
jiaoyangna d0023bbcdf 神魂显示修改提交 2022-01-17 13:56:06 +08:00
jiaoyangna 7d0c4e21d0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 13:24:04 +08:00
jiaoyangna 5bd09017e0 掩藏神魂 2022-01-17 13:23:19 +08:00
ZhangBiao e3196e3ca2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 13:16:30 +08:00
ZhangBiao 409836ffb5 【名望礼包】提交 2022-01-17 13:16:18 +08:00
jiaoyangna a4cbd77a99 许愿神将修改提交 2022-01-17 11:23:22 +08:00
jiaoyangna 4c1b1dbc30 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 11:19:23 +08:00
jiaoyangna 4abe2d4203 Revert "许愿神将修改提交"
This reverts commit fbd1c9aa43.
2022-01-17 11:18:55 +08:00
gaoxin 58b5702a30 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 11:06:41 +08:00
gaoxin e99f1a2ca7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 11:02:48 +08:00
gaoxin 69e30f8fd0 【关卡】功能引导时关闭小手显示 2022-01-17 11:02:33 +08:00
wangzhenxing 6be87dec74 Merge branch 'china/dev' into china/飞升 2022-01-17 11:00:42 +08:00
jiaoyangna 501d3758fd 升级显示消耗 2022-01-17 10:59:48 +08:00
jiaoyangna 6d3d7f5e4f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 10:59:08 +08:00
wangzhenxing 51d1f9e5a7 【图鉴】======图鉴列表界面预设修改 2022-01-17 10:58:36 +08:00
jiaoyangna 28b3fb33f3 技能报错修改提交 2022-01-17 10:56:38 +08:00
ZhangBiao 34edc4332e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 10:53:19 +08:00
ZhangBiao ffbdafd13e 【修行】红点检测 2022-01-17 10:53:06 +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 eb6a0c5dde Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-17 10:46:12 +08:00
wangzhenxing 21e77fe60b [图鉴]=======图鉴详情预设修改 2022-01-17 10:45:42 +08:00
ZhangBiao 98f89d8a9b 【摘星阁+修为】装备属性展示+修为红点检测 2022-01-17 10:44:43 +08:00
ZhangBiao 91f9589043 【摘星阁】装备属性 2022-01-17 10:33:42 +08:00
ZhangBiao e93b2816b4 【摘星阁】装备摘星阁属性拆分 2022-01-17 10:24:27 +08:00
jiaoyangna fbd1c9aa43 许愿神将修改提交 2022-01-17 09:41:00 +08:00
wangzhenxing 9357e70d42 [角色信息]======名字位置修改 2022-01-15 18:44:08 +08:00
ZhangBiao 10070d14ca 【跳转】提交 2022-01-15 18:29:18 +08:00
ZhangBiao a556bf7761 【玩家信息】提交 2022-01-15 18:17:46 +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 aa90cae885 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-15 18:07:57 +08:00
ZhangBiao 2b8cb81ff3 【充值】跳转修改 2022-01-15 18:07:43 +08:00
wangzhenxing 692c333b34 [战斗]========被动421修改提交 2022-01-15 17:44:32 +08:00
ZhangBiao e67ea3ae70 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-15 17:34:26 +08:00
ZhangBiao b96aa3851c 【好感度】提交 2022-01-15 17:34:18 +08:00
wangzhenxing 1d170dfd2d [图鉴]==========图鉴详情修改提交 2022-01-15 17:12:40 +08:00
wangzhenxing 2df3e777db [图片]====记录按钮资源修改 2022-01-15 16:38:45 +08:00
wangzhenxing 1ef962d688 【图鉴】====飞升通用图标资源修改 2022-01-15 16:05:54 +08:00
ZhangBiao fa7123e998 【主题活动】0120-0202寻宝迷踪珍奇宝阁报错 2022-01-15 15:53:28 +08:00
ZhangBiao 3ad8b6b6c3 【玩家信息】提交 2022-01-15 15:44:08 +08:00
ZhangBiao 1f9275e9d8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-15 15:05:35 +08:00
ZhangBiao c373f8d014 【修改】提交 2022-01-15 15:05:26 +08:00
wangzhenxing 6f56edbdf7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-15 14:46:55 +08:00
ZhangBiao 38fb5a9ada 【每日特惠】每日特惠中免费和7天的按钮消失了 2022-01-15 14:40:06 +08:00
wangzhenxing c083c2c903 【战斗】====被动419修改 2022-01-15 14:38:56 +08:00
ZhangBiao 756dc54595 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-15 14:35:21 +08:00
ZhangBiao f4c1b9d097 【修改】提交 2022-01-15 14:34:55 +08:00
wangzhenxing e8f8f5ca59 [图鉴]=====图鉴详情修改提交 2022-01-15 14:32:55 +08:00
ZhangBiao bca67f4fd6 【玩家信息】报错修改 2022-01-15 13:26:22 +08:00
wangzhenxing 3311a00b91 【飞升】=======globadefine修改 2022-01-15 13:25:48 +08:00
ZhangBiao 28d4b2a8be 【玩家信息】提交 2022-01-15 13:07:28 +08:00
ZhangBiao 7feefd2078 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-15 13:01:44 +08:00
ZhangBiao fa1c832170 【坐骑】增加详细信息 2022-01-15 13:00:45 +08:00
wangzhenxing e160d27be7 [飞升]=====uidata修改 2022-01-15 12:48:58 +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
ZhangBiao ed48c7ce00 【寻仙招募】修改,提交 2022-01-15 10:27:48 +08:00
ZhangBiao 232491eb95 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-15 09:14:10 +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 75be0809dd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 18:49:21 +08:00
jiaoyangna b0611db595 神将技能修改提交 2022-01-14 18:48:23 +08:00
ZhangBiao e1a52271be Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 18:47:55 +08:00
ZhangBiao 5d2fdc5773 【仙缘汇聚箱】报错修改 2022-01-14 18:47:41 +08:00
jiaoyangna 2df72a0edd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 18:40:17 +08:00
jiaoyangna 3369bcc73c 心愿修改提交 2022-01-14 18:40:00 +08:00
ZhangBiao 3e47cae110 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 18:28:47 +08:00
ZhangBiao d7bd3a07d8 【心愿抽奖】报错修改 2022-01-14 18:28:36 +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
ZhangBiao 9d8586008d 【家园】资源替换 2022-01-14 17:51:56 +08:00
ZhangBiao 0b7943c391 【家园】特权按钮修改 2022-01-14 17:44:54 +08:00
ZhangBiao cbea9006b3 【家园】资源替换 2022-01-14 17:38:46 +08:00
ZhangBiao dddbe9f223 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 17:20:18 +08:00
ZhangBiao 9ec22eee1f 【好感度】引导 2022-01-14 17:20:06 +08:00
jiaoyangna b249db487a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 17:14:11 +08:00
jiaoyangna c11db3056f 神将修改 2022-01-14 17:13:36 +08:00
gaoxin 7c5284b1e8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 17:11:08 +08:00
gaoxin df2e07b0e3 【心魔编队】保存后自动关闭界面 2022-01-14 17:11:02 +08:00
jiaoyangna e6791caf3f 图片修改提交 2022-01-14 17:08:41 +08:00
jiaoyangna 0189f5c742 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 16:15:17 +08:00
jiaoyangna 3f267894a8 神将修改提交 2022-01-14 16:14:52 +08:00
ZhangBiao 8f554eca59 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-14 16:02:59 +08:00
gaoxin 1c827a3a23 【关卡】有可挑战关卡时添加小手显示 2022-01-14 16:02:10 +08:00
jiaoyangna d6521af965 许愿神将边框修改 2022-01-14 15:52:16 +08:00
ZhangBiao 28d3f421bc 【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交 2022-01-14 15:44:45 +08:00
jiaoyangna 2142bc452b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 14:53:14 +08:00
jiaoyangna 053de388f2 神将修改提交 2022-01-14 14:52:56 +08:00
ZhangBiao 771c445488 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-14 14:16:47 +08:00
ZhangBiao f9990072d5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 14:15:16 +08:00
ZhangBiao 930b93286d 【家园】数据不更新修改 2022-01-14 14:14:48 +08:00
gaoxin 69e6011950 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 13:52:55 +08:00
gaoxin 09f65e9f38 【修行】优化修行突破后显示 2022-01-14 13:51:13 +08:00
wangzhenxing a92dfdf671 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 13:50:19 +08:00
wangzhenxing cff6c3f21b [战斗]=====被动418-421提交 2022-01-14 13:49:39 +08:00
jiaoyangna 7556405e8b 切图修改 2022-01-14 13:45:12 +08:00
jiaoyangna 5252dbe400 技能添加底图 2022-01-14 13:20:32 +08:00
jiaoyangna 0323c50be5 法宝角标修改 2022-01-14 11:31:33 +08:00
jiaoyangna 981aba2417 神将情报修改提交 2022-01-14 11:26:13 +08:00
jiaoyangna 8377e33b31 神将情报修改提交 2022-01-14 10:50:51 +08:00
jiaoyangna 17db5f29c4 框修改提交 2022-01-14 10:25:27 +08:00
jiaoyangna ed63358ab6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_2000340_xy.png.meta
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_8810_hh.png.meta
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_ysz_7.png.meta
2022-01-14 10:19:54 +08:00
jiaoyangna e4ea506ed1 神将情报修改提交 2022-01-14 10:17:19 +08:00
ZhangBiao 8af671a6f8 【装备加持】排行榜查看玩家时装备加持不显示突破数值和突破属性 2022-01-14 10:14:29 +08:00
ZhangBiao 5b36346da3 【玩家信息】提交 2022-01-13 18:29:12 +08:00
ZhangBiao 27cb303fc3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 18:27:01 +08:00
ZhangBiao 1e234c6aa8 【家园】材料不足突破红点修复 2022-01-13 18:26:39 +08:00
gaoxin a119734ba8 [meta] 2022-01-13 17:55:12 +08:00
wangzhenxing 931e2e304d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 17:45:54 +08:00
wangzhenxing 69d1a45883 【战斗】=====反伤盾图片提交 2022-01-13 17:45:31 +08:00
jiaoyangna fe4c807633 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 16:41:45 +08:00
jiaoyangna 1515c59bac 法宝聚灵添加白金 2022-01-13 16:41:23 +08:00
gaoxin 70d753cce5 极速探索按钮颜色调整 2022-01-13 16:41:12 +08:00
ZhangBiao f043b3e62f Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-13 16:04:36 +08:00
ZhangBiao 898f88a0b9 【寻仙招募】修改奖励显示内容 2022-01-13 16:03:20 +08:00
ZhangBiao 2599afd6de 【寻仙招募】心愿选飞升石,查看奖励报错 2022-01-13 15:28:09 +08:00
ZhangBiao 36b475ee15 【玩家信息】增加额外属性 2022-01-13 15:23:59 +08:00
lihaiyang 228efd4109 4个法宝图标 2022-01-13 15:17:17 +08:00
jiaoyangna a4848406b1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 14:00:28 +08:00
jiaoyangna 0e8e6e1874 探索修改提交 2022-01-13 13:59:15 +08:00
gaoxin 8351aba49c 【战斗】我方buff显示位置修改 2022-01-13 13:56:08 +08:00
lihaiyang be545631ad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 13:36:50 +08:00
lihaiyang 8aef1e33ed 被动图标 2022-01-13 13:27:30 +08:00
gaoxin 455cdcd19c 【日常副本】列表动画添加 2022-01-13 12:04:22 +08:00
gaoxin 4ffae70799 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 11:39:15 +08:00
gaoxin 1c5736bbad 【动画】部分界面动画优化 2022-01-13 11:39:02 +08:00
gaoxin db279baaf7 【跨服战】尝试修复打开跨服战报错 2022-01-15 07:36:48 +08:00
gaoxin a30aa0df10 【家园】修复等级为0时查看神将信息报错 2022-01-15 07:22:52 +08:00
jiaoyangna 07534deff9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 11:18:28 +08:00
jiaoyangna 8b4533aac9 一键探索调整编队后探索地图修改提交 2022-01-13 11:17:18 +08:00
wangzhenxing a16b592892 [飞升]=========飞升优化修改 2022-01-13 10:01:22 +08:00
ZhangBiao 48901f3817 【寻仙招募】心愿单中添加飞升石道具 2022-01-12 18:27:16 +08:00
wangzhenxing cd1b81c03e [飞升]======飞升修改提交 2022-01-12 17:29:52 +08:00
wangzhenxing ff7b7ba5ed [飞升]=====bug修改提交 2022-01-12 16:41:51 +08:00
ZhangBiao 1e8cceea57 【家园】特效层级修改 2022-01-12 15:55:24 +08:00
ZhangBiao a74799caea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-12 15:38:45 +08:00
ZhangBiao f131da8558 【方寸寻宝】点击自选箱显示详细信息 2022-01-12 15:38:31 +08:00
jiaoyangna 05e078dadc 探索引导修改提交 2022-01-12 15:27:35 +08:00
jiaoyangna 1e1e697ba4 预设漏提 2022-01-12 14:40:28 +08:00
jiaoyangna 6cc1b55503 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-12 14:36:43 +08:00