Commit Graph

766 Commits (2aa3d13593d17ee87ca0283d01bf9e83c348db07)

Author SHA1 Message Date
jiaoyangna b0611db595 神将技能修改提交 2022-01-14 18:48:23 +08:00
jiaoyangna 81ce84e7be 升级修改提交 2022-01-14 17:57:12 +08:00
jiaoyangna c11db3056f 神将修改 2022-01-14 17:13:36 +08:00
jiaoyangna 3f267894a8 神将修改提交 2022-01-14 16:14:52 +08:00
jiaoyangna 053de388f2 神将修改提交 2022-01-14 14:52:56 +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 e4ea506ed1 神将情报修改提交 2022-01-14 10:17:19 +08:00
wangzhenxing a16b592892 [飞升]=========飞升优化修改 2022-01-13 10:01:22 +08:00
wangzhenxing ff7b7ba5ed [飞升]=====bug修改提交 2022-01-12 16:41:51 +08:00
jiaoyangna 0b4cfe3a74 点击技能切换修改 2022-01-12 14:35:27 +08:00
jiaoyangna 93fda69ff5 升级突破状态显示错误修改 2022-01-12 13:37:39 +08:00
jiaoyangna f943824ae9 共鸣中修改提交 2022-01-11 15:40:22 +08:00
jiaoyangna a01485ebab 资源提交 2022-01-11 15:36:17 +08:00
jiaoyangna e12e783590 共鸣中修改提交 2022-01-11 15:31:19 +08:00
jiaoyangna 36c6228096 图片修改提交 2022-01-11 14:56:37 +08:00
jiaoyangna 4d58e36be4 神将界面技能报错修改 2022-01-11 14:44:16 +08:00
jiaoyangna af9306d8cf 未解锁添加未解锁提示 2022-01-11 14:23:24 +08:00
jiaoyangna b0e7ce6238 代码漏提 2022-01-11 13:49:18 +08:00
jiaoyangna 40e37473dc 【ID1011029】
【优化】 神将界面优化
2022-01-11 11:09:44 +08:00
wangzhenxing 1b39fbdbe9 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
wangzhenxing a68fa4e0f6 【飞升】============飞升添加特效 2022-01-07 13:41:57 +08:00
wangzhenxing e5c176cd9f [飞升]============特效显示修改提交 2022-01-07 10:08:55 +08:00
ZhangBiao 9c874f1789 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
#	Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
2022-01-06 15:38:48 +08:00
jiaoyangna c8b604bde4 【ID1011007】
【优化】功能开启增加新条件类型
2022-01-06 11:30:35 +08:00
wangzhenxing 5b670023ed [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
ZhangBiao c0d27feac2 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2022-01-05 10:16:25 +08:00
gaoxin 0c9b3b4f96 【角色信息】修复回收立绘错误 2021-12-31 17:55:01 +08:00
wangzhenxing 2f2634eb39 【飞升】=====代码预设提交 2021-12-31 13:50:49 +08:00
ZhangBiao cf9cbc5ac9 【家园】摘星阁装备属性加持+战斗力 2021-12-31 13:44:11 +08:00
gaoxin 17394f79a0 【动画】神将切换动画优化 2021-12-31 01:45:13 +08:00
wangzhenxing 73d92664de [飞升]=======飞升逻辑提交 2021-12-28 16:20:07 +08:00
wangzhenxing 380b0bdb78 [飞升]=============飞升代码提交 2021-12-27 16:39:38 +08:00
jiaoyangna c5448299c0 报错修改提交 2021-12-15 13:35:44 +08:00
jiaoyangna 0c83c3412e 【ID1010843】
增加英雄回退功能
2021-12-14 17:25:44 +08:00
ZhangBiao 3bc06e9b8e 【白金装备】装备穿戴界面,四星白金装备比五星白金装备排序靠前,其他部位没问题 2021-12-13 10:14:54 +08:00
wangzhenxing 35e42ed5f0 【战斗】===buff图标资源 回合变化延时修改 2021-12-07 13:18:52 +08:00
wangzhenxing 898f3a9b99 [立绘朝向]=======英雄列表初始化立绘朝向修改 2021-11-30 22:53:49 +08:00
wangzhenxing 6b742c0788 [立绘朝向]======皮肤立绘朝向修改 2021-11-30 20:43:56 +08:00
wangzhenxing bdb02e9fa4 [战斗]=====皮肤立绘朝向修改 2021-11-30 11:04:25 +08:00
wangzhenxing 1eb6115bc9 [角色朝向]=======立绘朝向修改 2021-11-29 13:21:23 +08:00
wangzhenxing dd248f37f6 [角色朝向]======进阶展示,皮肤显示,好感度 2021-11-27 17:18:04 +08:00
wangzhenxing 3c22a1ef6c [立绘朝向]======静态立绘朝向改回原样 2021-11-27 13:17:36 +08:00
wangzhenxing c80968098c 【立绘朝向】=============装备界面立绘朝向 2021-11-27 13:01:27 +08:00
wangzhenxing 69e30d908c [立绘朝向]===============我方立绘展示朝向修改 2021-11-26 16:55:13 +08:00
gaoxin ecedea90f8 Merge branch '0功能/新增克制属性' into china/dev 2021-11-18 10:49:34 +08:00
gaoxin 12fe3eb3e4 【战斗力】公式参数走表,装备,法宝战斗力计算公式修改 2021-11-17 15:55:37 +08:00
ZhangBiao b6ce191bff 【装备界面】无法卸下调整 2021-11-17 12:34:39 +08:00
jiaoyangna cd5c2f585a 【ID1019160】
【神将】初始4星情报界面有魂印图标,点击提示6星解锁

(cherry picked from commit ee46920fe5)
2021-11-16 17:17:35 +08:00
ZhangBiao 2c0032b829 【神魂】头像框错误修改 2021-11-15 16:58:49 +08:00
ZhangBiao b7c354befe 【神魂】神魂头像框修改 2021-11-15 16:44:46 +08:00
jiaoyangna 6ed696b426 法宝界面文字大小修改 2021-11-12 09:40:13 +08:00
gaoxin 3addb9905b 【神将觉醒】觉醒成功界面中,不需要显示非核心天赋的变化(非特性天赋),且【特性】文字需要放大 2021-11-11 14:10:48 +08:00
jiaoyangna 4455242293 【ID1019110】
【神魂图鉴】图鉴中的神魂弹窗,神将头像不是边框边框
2021-11-11 13:41:42 +08:00
ZhangBiao 7efdfd5029 【新·装备】增加战力对比图标 2021-11-09 18:24:38 +08:00
ZhangBiao f18880622e 【新·魂灵宝】提交 2021-11-09 17:06:47 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
jiaoyangna 265aaca235 神将界面特效修改提交 2021-11-08 15:18:28 +08:00
gaoxin bbb89af48e 【英雄突破】白骨精升级到100级点击突破按钮,弹出跳转提示,点击前往进阶界面报错 2021-11-08 14:10:26 +08:00
gaoxin 67f3ca9f52 【适配】1080*2550,进阶白骨精法宝,文字描述遮挡 2021-11-08 13:39:29 +08:00
ZhangBiao a577d80d76 【神魂】增加特效 2021-11-08 13:02:00 +08:00
jiaoyangna 1329112387 神魂未激活图片修改提交 2021-11-08 11:24:10 +08:00
jiaoyangna e8433d1026 玉虚论道记录神魂修改提交,神将界面修改提交 2021-11-08 10:30:12 +08:00
ZhangBiao a953a78018 【升星有礼】觉醒后没有红点修改 2021-11-05 18:14:44 +08:00
wangzhenxing 99452354bc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:21:30 +08:00
wangzhenxing a92a76e3ab 【神魂】=====技能描述修改 2021-11-05 17:21:18 +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 142956ca6a 【活动】活动修改提交 2021-11-05 16:43:09 +08:00
jiaoyangna d0d93e02ea 代码星星层级设置修改 2021-11-05 13:18:55 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
jiaoyangna 154aa77cd3 神魂特效修改提交 2021-11-04 10:46:25 +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 6f0d51ddb2 神魂提交 2021-11-03 18:11:08 +08:00
gaoxin 820b45cfa0 【宝物】修复神树和四灵变化后,没有重新计算宝物评分的问题 2021-11-03 15:16:48 +08:00
jiaoyangna 604b1d6819 神魂提交 2021-11-03 11:18:37 +08:00
jiaoyangna 0468c865db 神魂提交 2021-11-03 10:32:55 +08:00
jiaoyangna 125e37fe6d 神魂提交 2021-11-03 10:13:44 +08:00
jiaoyangna a41765d10b 神魂提交 2021-11-02 10:20:17 +08:00
jiaoyangna 681f8d5a57 神魂提交 2021-11-01 19:11:59 +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
ZhangBiao 75827dc392 【界面优化】心魔试炼、战斗统计、法宝进阶 2021-11-01 15:36:40 +08:00
jiaoyangna 9249ed85cb 神魂预设修改 2021-10-28 16:19:59 +08:00
ZhangBiao 87a95f0612 【界面优化】还原”特性“、大闹天宫 2021-10-28 14:14:30 +08:00
jiaoyangna 478676cd21 神魂位置修改提交 2021-10-28 10:38:19 +08:00
jiaoyangna f71c604cb2 每次切换至神魂页面时,自动滑动至已激活的最高神魂等级所在区域, 2021-10-27 18:28:07 +08:00
jiaoyangna 82d0e28baa 神魂提交 2021-10-27 18:03:09 +08:00
jiaoyangna 9f59cb3b64 神魂提交 2021-10-27 17:04:33 +08:00
jiaoyangna d4d9b88fe7 神魂修改提交 2021-10-27 15:24:46 +08:00
jiaoyangna d398c21668 神魂提交 2021-10-27 12:50:15 +08:00
ZhangBiao e29dd36c26 【界面优化】法宝界面 2021-10-26 16:33:20 +08:00
jiaoyangna 5e8ad7dd08 神魂提交 2021-10-26 16:00:31 +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 1f5f4f15c3 【弹窗优化】提交 2021-10-22 14:22:12 +08:00
jiaoyangna 06a8251a40 神魂界面提交 2021-10-20 18:02:09 +08:00
ZhangBiao e2cb67caf3 【修行】点击加成按钮后 游戏崩溃修改 2021-10-20 14:27:43 +08:00
jiaoyangna b50e5ee2bf Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zn01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-10-18 10:38:49 +08:00
jiaoyangna 097d5cf1cc 神魂初版提交 2021-10-18 10:36:32 +08:00
jiaoyangna 9e46ffd910 神将天赋界面修改提交 2021-10-14 17:14:51 +08:00
jiaoyangna 60b53f2d7b 神将详情,装备修改提交 2021-10-12 15:32:07 +08:00
jiaoyangna e70329e605 神将详情显示错误修改 2021-10-12 14:54:12 +08:00
jiaoyangna e7cfacdccd 神奖详情界面修改提交 2021-10-12 14:26:19 +08:00
jiaoyangna b0f9b28036 神将详情报错修改提交 2021-10-12 12:17:33 +08:00
jiaoyangna 1a165839fd 点击神将详情界面查看属性按钮报错修改必现 2021-10-12 12:16:31 +08:00
gaoxin 2eb04261bc Merge branch '0优化/装备对比' into china/dev 2021-09-30 15:01:40 +08:00
gaoxin 4d907f1530 【装备界面优化】移除替换装备和宝物时上方的当前装备/宝物信息 2021-09-30 15:01:19 +08:00
gaoxin 73709000a9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-29 17:34:38 +08:00
gaoxin 971a457224 【战斗力】修复计算在编队上的人物临时数据时未计算编队相关属性的问题 2021-09-29 17:34:20 +08:00
gaoxin e56affc4b4 【装备对比】装备穿戴界面显示修改 2021-09-28 19:45:21 +08:00
jiaoyangna 33acb35f82 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-09-28 09:52:22 +08:00
ZhangBiao a4ee19a351 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 17:02:59 +08:00
ZhangBiao 5939c5b2f8 【七界试炼】跳转提交 2021-09-27 17:02:43 +08:00
wangzhenxing 70ebab2fe1 【功能】====装备合成添加特效 2021-09-27 16:25:20 +08:00
jiaoyangna 9137d9f592 新手引导调整 2021-09-27 14:22:23 +08:00
jiaoyangna 4e17b829ba 红点修改提交,挂机界面预览修改提交 2021-09-27 10:58:41 +08:00
jiaoyangna 683e71ae89 好感度入口调整 2021-09-27 09:45:57 +08:00
jiaoyangna 3a5e3cf17e 好感度提交 2021-09-26 21:32:04 +08:00
gaoxin f282fe046b 【白金装备】修改白金装备字体显示 2021-09-26 18:41:47 +08:00
gaoxin b21e7efe0d 【角色信息】修复跳转到角色信息界面,点击左右箭头报错 2021-09-26 17:38:23 +08:00
gaoxin e61dea0f4a 【白金装备】套装显示添加 2021-09-26 17:13:12 +08:00
jiaoyangna 14b967185b 好感度提交 2021-09-26 10:18:51 +08:00
jiaoyangna a8eeec83f6 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.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/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-22 20:53:08 +08:00
jiaoyangna 529094b6ad 好感度第一次提交 2021-09-22 20:47:13 +08:00
gaoxin 472409a1b3 【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题 2021-09-17 17:00:59 +08:00
gaoxin feae377b4f Merge branch 'china/dev' into 0功能/角色战斗力计算2 2021-09-17 15:25:56 +08:00
gaoxin 247d9a85d0 【战斗力】删除无用的属性计算 2021-09-17 15:10:06 +08:00
gaoxin a7ce05450b 【战斗力】 功能属性加入战斗力初始化 2021-09-17 15:08:37 +08:00
jiaoyangna 8293c56b37 建木神树图片修改提交
(cherry picked from commit f127a0e858)
2021-09-16 17:11:29 +08:00
jiaoyangna f127a0e858 建木神树图片修改提交 2021-09-16 17:10:39 +08:00
ZhangBiao 1e17301cc8 【背包优化】宝物背包按照品质优先级进行排序,并增加阵营筛选功能 2021-09-16 16:16:50 +08:00
gaoxin 2494b16f89 Merge branch 'china/dev' into 0功能/角色战斗力计算2 2021-09-16 13:37:16 +08:00
gaoxin 66efc9d4e3 【战斗力】新战斗力计算系统完成 2021-09-16 13:35:33 +08:00
jiaoyangna cb6c480956 宝物强化界面消耗本体去掉加号 2021-09-13 17:30:01 +08:00
jiaoyangna d55dd4c59d 共鸣宝物报错强化修改提交 2021-09-13 16:17:38 +08:00
gaoxin 7df51e8929 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
2021-09-11 16:52:33 +08:00
zhangshanxue 053650b3e7 Merge branch 'china/test' into china/xq 2021-09-06 16:36:25 +08:00
gaoxin 59ec0d6f20 【觉醒】修复会自动选择鸿蒙阵共鸣神将的问题 2021-09-06 16:35:46 +08:00
zhangshanxue 39fc099fe6 Merge branch 'china/dev' into china/xq
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-09-03 16:01:20 +08:00
ZhangBiao 68791a5745 【战力】连续打开变负数修改 2021-09-03 11:10:24 +08:00
ZhangBiao 08e8944e47 【战力问题】PVP增减伤引起的战力不统一问题修改 2021-09-02 22:24:58 +08:00
jiaoyangna 37c1c77737 添加道具 太初之气 加号 2021-09-02 16:17:26 +08:00
jiaoyangna ac0955bb13 宝器修改提交 2021-09-02 16:12:37 +08:00
jiaoyangna 88f88d1249 适配修改提交 2021-09-02 11:20:18 +08:00
jiaoyangna 9ab223d577 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-01 19:20:34 +08:00
jiaoyangna 3372e2a965 已激活属性之间的空隙过大 2021-09-01 14:49:58 +08:00
jiaoyangna 13e7935d1d 下方显示替换红点,点击一键装备无法替换 2021-09-01 12:47:30 +08:00
jiaoyangna 1744845cba 建木神树转移到修行 2021-09-01 11:57:15 +08:00
jiaoyangna a12c9330c7 四灵第二次修改提交 2021-09-01 10:08:25 +08:00
jiaoyangna 56af6f1a11 第一次bug修改提交 2021-08-31 20:22:59 +08:00
jiaoyangna 207a4eb512 战力修改提交 2021-08-31 18:07:34 +08:00
jiaoyangna f712786650 排行榜宝物数据修改 2021-08-31 17:50:58 +08:00
jiaoyangna d660fe362e 装备宝物界面修改提交 2021-08-31 17:06:01 +08:00
jiaoyangna ac22bd000b 装备宝物界面修改提交 2021-08-31 17:02:22 +08:00
jiaoyangna 13f74e0185 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-31 11:39:16 +08:00
jiaoyangna 4801852d88 神应修改提交 2021-08-30 18:09:06 +08:00
jiaoyangna 1ea100ed83 神将情报界面装备宝物修改提交 2021-08-30 16:44:26 +08:00
jiaoyangna a76f27ecf0 四灵提交 2021-08-30 14:21:41 +08:00
gaoxin ee4a465c41 【角色升星】修复角色达到最大星级依然可以跳转觉醒、进阶页签的问题 2021-08-28 15:20:44 +08:00
jiaoyangna 2fbe372c76 四灵修改提交 2021-08-27 18:39:45 +08:00
ZhangBiao 3a102c93fa 【觉醒】神将界面觉醒显示 2021-08-26 18:54:14 +08:00
jiaoyangna ab1a4ea627 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-26 17:42:25 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
zhangqiang 20554f8fd8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-26 11:49:11 +08:00
zhangqiang 17e4c209c7 【神将列表】排序修改-张彪 2021-08-26 11:48:36 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
zhangqiang b44c1a3e8f 【装备界面】装备界面替换魂灵宝,会生成一个假的宝物 2021-08-25 18:07:05 +08:00
jiaoyangna 0c7e38a715 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-25 15:25:54 +08:00
ZhangBiao 1614afb3bf 【排序优化】修改神将界面中的排序规则 2021-08-23 15:45:10 +08:00
jiaoyangna 662a760eaf 【ID1018142】
【宝物】宝物分解界面,没有精炼加号,统一 一下
2021-08-17 17:31:53 +08:00
gaoxin 4d91c779c9 【神将升级】删除原用于防止升级超过突破等级的限制条件 2021-08-16 11:33:45 +08:00
ZhangBiao 17afa71bd2 【修行】预览调整 【魂灵宝】属性调整 2021-08-13 14:06:35 +08:00
zhangqiang 33bbaf3cf9 【修行】预览增加星数,魂灵宝 2021-08-13 13:32:59 +08:00
ZhangBiao e672b2644a 【魂灵宝】装备界面魂灵宝信息界面修改 2021-08-12 17:38:24 +08:00
jiaoyangna 76dbc01270 Merge branch 'china/dev' into 0功能/silingshilian 2021-08-12 15:54:58 +08:00
zhangqiang 0e0d5ffdb0 【鸿蒙阵】步骤:共鸣效果100级,上阵共鸣神将,在化虚坛中进阶该神将,进阶后在鸿蒙阵把该神将卸下,并在神将情报界面升级,升级后重登,还原错误的天赋,但保留错误的等级 2021-08-10 14:52:07 +08:00
jiaoyangna 6b8c2f2f3c Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
2021-08-06 11:15:13 +08:00
jiaoyangna 2ecffb1b10 宝物培养位置修改 2021-07-30 17:58:47 +08:00
jiaoyangna c6c11c9374 宝物消耗震动修改 2021-07-30 15:11:56 +08:00
jiaoyangna aa82fc9f6b 震动效果修改 2021-07-30 14:17:44 +08:00
jiaoyangna 9ce0dcbf75 返回界面装备显示错误修改 2021-07-30 14:05:06 +08:00
jiaoyangna f73a554f35 宝物震动修改 2021-07-29 18:57:30 +08:00
jiaoyangna 548e43b486 共鸣中去掉一键装备红点 2021-07-29 14:33:52 +08:00
jiaoyangna beacff1d20 共鸣中的宝物去掉红点 2021-07-29 11:53:11 +08:00
jiaoyangna f935fb163b 层级修改提交 2021-07-29 11:34:53 +08:00
jiaoyangna 63780c4c7a 宝物共鸣修改 2021-07-29 11:13:34 +08:00
jiaoyangna 93a9473184 红点修改提交 2021-07-28 16:52:41 +08:00
jiaoyangna ad850da05f 宝物共鸣修改 2021-07-28 15:40:50 +08:00
jiaoyangna ab9e5f8e64 红点修改提交 2021-07-28 14:00:17 +08:00
jiaoyangna eea24f126e 红点添加 2021-07-28 13:49:04 +08:00
jiaoyangna 527295f30c 宝物优化 2021-07-28 10:51:39 +08:00
jiaoyangna 88df4dbde8 为装备的宝物点击报错修改提交 2021-07-28 09:48:08 +08:00
jiaoyangna d1845618d1 宝物可强化时,TIPS上的【强化】按钮未显示红点,精炼功能有相同问题 2021-07-27 18:53:36 +08:00
jiaoyangna 94c92a7f22 拥有可替换/战斗力较高的宝物时,应在宝物图标右上角,及下方的魂宝/灵宝按钮上显示红点,不应当在魂宝/灵宝装备格子上显示红点 2021-07-27 18:34:37 +08:00
jiaoyangna d4126bb634 宝物培养修改 2021-07-27 14:39:48 +08:00
jiaoyangna 917662ff20 宝物培养红点提交 2021-07-26 17:16:29 +08:00
jiaoyangna 734efe7b52 红点修改提交 2021-07-24 19:36:34 +08:00
jiaoyangna 9d78af51e0 强化和精炼界面修改 2021-07-24 16:22:16 +08:00
jiaoyangna bcd0651029 宝物培养修改提交 2021-07-23 19:12:42 +08:00
jiaoyangna c131d41d58 装备界面改动 2021-07-21 18:27:03 +08:00
jiaoyangna 4442b9c38b 【ID1017598】
【灵兽白泽活动】点击查看红色装备TIPS后,切换至灵兽白泽互动点击金色装备,弹出的装备TIPS中会多出套装属性
2021-07-21 16:54:38 +08:00
gaoxin e85939abc7 【角色升级】修复高星级无法升级的问题 2021-07-13 11:19:01 +08:00
gaoxin 3d3797345d 【角色升级】添加非正常升级校验 2021-07-12 20:11:15 +08:00
gaoxin facb0fdf4a 【角色升级】删除升级校验 2021-07-12 17:29:39 +08:00
gaoxin 58b2c30ea9 【角色升级】修复升级错误的问题 2021-07-12 15:59:14 +08:00
gaoxin febee39f82 【英雄升级】英雄长按升级时不再进行切换操作 2021-07-12 10:33:05 +08:00
gaoxin 96475f3085 【角色升级】添加突破最大等级判断 2021-07-10 17:29:31 +08:00
jiaoyangna 4531a9636a 神将界面层级修改提交
(cherry picked from commit 1e18e57b12)
2021-07-09 18:41:11 +08:00
ZhangBiao 958254f93d 【神将升级】升级加校验 2021-07-09 16:56:05 +08:00
zhangqiang 632291a19c 【法宝归元】鸿蒙阵上的英雄归元法宝弹 null and 【灵兽山】长按升级弹服务器开小差 2021-07-05 15:34:42 +08:00
ZhangBiao 70b42de2ac Merge branch 'china/dev' into 0活动开发聚集地/特惠神装 2021-07-01 20:09:56 +08:00
jiaoyangna 4f34d6ed42 神将来源返回时打开 2021-07-01 18:12:20 +08:00
ZhangBiao 53567ea586 【Log】清除带颜色的Log 2021-07-01 16:33:40 +08:00
jiaoyangna 37b7071ccf 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-29 20:05:15 +08:00
zhangqiang 85d9610f41 【神将升级】升级到等级上限没有给后端发协议 2021-06-28 19:37:43 +08:00
zhangqiang a87f40756d 【鸿蒙阵】将五星神将放入鸿蒙阵,期间进行升星操作,这时候把神将下阵,由等级控制的前五个天赋会被保留,重登显示正常 2021-06-25 15:14:12 +08:00
jiaoyangna b83e8902d7 【ID1009368】
添加升星预览功能
2021-06-16 11:16:41 +08:00
gaoxin 13d7b61e35 【神将信息】修复切换到装备界面返回无法切换页签的问题 2021-06-15 11:17:15 +08:00
jiaoyangna fe1570f667 神将详情界面修改提交 2021-06-11 16:09:42 +08:00
zhangqiang 23f90ccf52 【线上】【鸿蒙阵】共鸣装备无法卸下,弹服务器开小差 2021-06-10 18:37:16 +08:00
gaoxin 206fcf9d92 【红点】修复部分红点被错误清除的问题 2021-06-04 23:54:59 +08:00
zhangqiang 1933ffa809 【神将升级】满级还显示升级按钮 2021-06-03 19:38:22 +08:00
jiaoyangna 9b13236cfc 添加限制皮肤显示 2021-06-03 10:59:54 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
ZhangBiao 53703a8f2e 【修行】属性顺序 2021-05-26 18:32:03 +08:00
jiaoyangna c95211428b Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-26 11:55:14 +08:00
ZhangBiao 41152acae9 【修行】排行榜界面,神将界面、神将替换提示调整 2021-05-25 11:54:19 +08:00
jiaoyangna 33834cc9b2 Merge branch 'china/dev-c' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Atlas/FourElement.meta
#	Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
#	Assets/ManagedResources/LuaBytes.meta
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
2021-05-24 16:39:34 +08:00
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.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/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00
ZhangBiao 3f7e243b70 【修行】this.spLoader提交 2021-05-20 09:48:52 +08:00
ZhangBiao be1085d2bb Merge branch 'china/dev-c' into 0功能/修行玩法
# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/r_huodong_tiao02.png.meta
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua
2021-05-19 20:01:57 +08:00
gaoxin 6d551869be 【内存优化】新内存内存优化修改 2021-05-19 15:06:02 +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 b88957bcad 【修行】神将增加神印显示 2021-05-18 20:04:52 +08:00
jiaoyangna d62b8b5011 无尽副本修改提交 2021-05-14 19:11:40 +08:00
ZhangBiao 7d63d1e191 【修行】提交 2021-05-12 17:40:38 +08:00
ZhangBiao 92b22fdc0c 【修行】提交 2021-05-12 10:35:58 +08:00
zhangqiang c202e03703 【英雄详情升星】升星后的属性没有加团队属性 2021-04-29 10:09:27 +08:00
gaoxin 7df1514da8 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
2021-04-26 17:55:43 +08:00
zhangqiang 2b595bb8f5 【跳转】化虚坛跳转修改2 2021-04-25 14:20:07 +08:00
gaoxin f1c10a99e9 【ios推荐】白片处理 2021-04-22 21:34:11 +08:00
gaoxin fa61ea1317 【ios推荐服】白片处理,修复无尽副本无法返回,修复副本回到主界面点击其他页签黑屏 2021-04-22 20:39:30 +08:00
gaoxin 868643f87c 【spLoader】处理一些白片问题 2021-04-22 18:26:48 +08:00
gaoxin d9640a660c 【sploader】翻译资源加载优化 2021-04-22 17:54:03 +08:00
gaoxin 43afe3d6f1 【内存】btview可能会导致重复卸载资源的问题 2021-04-22 13:40:04 +08:00
gaoxin 3819869e27 Merge branch 'china/dev' into china/ios
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
2021-04-21 17:54:16 +08:00
ZhangBiao 2df3ac159c 【限时活动】完成?删除loggreen 2021-04-21 16:36:12 +08:00