Commit Graph

3247 Commits (fce7a7ec32e6f3132541df87fc71ee92731b8da4)
 

Author SHA1 Message Date
ZhangBiao 2fed5ddb45 【森罗幻境】进入森罗幻境后直接关闭选择神将弹窗,会在离开幻境前闪过一个统计弹窗 修复 2021-01-04 11:04:37 +08:00
jiaoyangna c66fdcf0ed 【优化】修改公会图腾功能 2021-01-04 10:49:44 +08:00
ZhangBiao fc8f74cd3a 【森罗幻境】在进入下一层后,下方的神将头像位置会发生变化 修复 2021-01-04 10:41:35 +08:00
ZhangBiao 667adb2ba1 【资源替换】重置界面妖晶资源替换 2020-12-31 17:18:37 +08:00
zhangqiang 997aaff78f 【寻宝加锁】提示 2020-12-31 16:20:05 +08:00
jiaoyangna d249a4c0c1 【优化】挂机宝箱显示当前的挂机时间 2020-12-31 15:55:20 +08:00
zhangqiang ec81feaa06 【公会技能】长按升级bug 2020-12-31 15:53:05 +08:00
zhangqiang 7402a7ce6c 【工會技能】长按升级bug 2020-12-31 15:29:08 +08:00
zhangqiang 694320d99c Merge branch '0功能/1月6_版本优化' into master_develop
# Conflicts:
#	Assets/Effect_ls_08_jinwu_attack_02.controller.meta
#	Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_banner.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon2.png.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation/GameObject 7.controller.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture.meta
#	Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller
#	Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller.meta
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.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/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	FontArt/ArtFont_zh/s_shengxingyouli_anniu_01_zh.png
#	FontArt/ArtFont_zh/s_shengxingyouli_anniu_02_zh.png
#	FontArt/中英文不一致资源/zh/s_shengxingyouli_banner_zh.png
2020-12-31 14:53:17 +08:00
jiaoyangna 44951a3766 [战斗] ====优化伤害,中毒燃烧数字显示速度 2020-12-31 14:14:56 +08:00
ZhangBiao 853b541fb5 【抽卡提示】六个抽卡分别加上妖晶提示
(cherry picked from commit 73aeaf3d89)
(cherry picked from commit 56cf5e10600a72ca635592f4ae6a2298542c7cc9)
2020-12-31 10:50:14 +08:00
ZhangBiao 3280394186 【抽卡优化】连续十连或单抽也有确认提示
(cherry picked from commit becdc2dd88)
(cherry picked from commit 47378d9c50b36d9576a88dccb66016f2ca10127b)
2020-12-31 10:49:39 +08:00
zhangqiang 0a2b4f3c3e 【漏提】 2020-12-30 18:25:48 +08:00
zhangqiang b3bd8f8fa6 【漏提】 2020-12-30 18:20:32 +08:00
jiaoyangna 3fa2f1b7f8 Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-30 18:17:39 +08:00
jiaoyangna 21321eeede 【优化】修改四灵阵界面的宣传人物图片 2020-12-30 18:17:26 +08:00
zhangqiang a6d16c13e5 【寻宝】加锁 2020-12-30 18:08:44 +08:00
jiaoyangna 223c23f4bd [狭路相逢] 提交 2020-12-30 15:56:11 +08:00
jiaoyangna 186906ed2c 灵兽宝阁假战斗id修改为读GlobalActivity表的ExpertDec 这一列 2020-12-30 11:21:13 +08:00
jiaoyangna 0e8811df2b 【优化】背包中使用多个道具,明确标注数量 2020-12-30 11:02:44 +08:00
jiaoyangna 2e6cdb5014 【优化】背包中使用多个道具,明确标注数量 2020-12-30 10:34:06 +08:00
zhangqiang c79285e4ca 【竞技场】在线等待赛季刷新,攻击次数奖励异常-dev 2020-12-29 17:36:01 +08:00
zhangqiang 739f390115 Merge branch 'master_xma_local' into 0功能/1月6_版本优化
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
2020-12-29 17:00:08 +08:00
zhangqiang 1227e93456 【寻宝】 优化 加锁 1 2020-12-29 16:56:18 +08:00
zhangqiang 35f211a2a4 【工会技能】 优化 连续升级 2020-12-29 16:15:11 +08:00
ZhangBiao c84656e705 【降妖夺宝】取消抽卡前摇 2020-12-29 14:51:30 +08:00
ZhangBiao 99d574ba27 Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-29 14:24:55 +08:00
ZhangBiao 73aeaf3d89 【抽卡提示】六个抽卡分别加上妖晶提示 2020-12-29 14:24:45 +08:00
jiaoyangna 1cf3f17888 【优化】神将解锁锁定状态基本看不出来,让其更加明显 2020-12-29 14:23:53 +08:00
zhangqiang 2576c5bcdd 【新将来袭】banner 图片替换 2020-12-29 12:13:29 +08:00
jiaoyangna fffb834f8a 【优化】挂机宝箱显示当前的挂机时间 2020-12-29 11:26:34 +08:00
ZhangBiao 5137e588dc Revert "【关卡界面】怎加挂机时间"
This reverts commit 136b2a4c18.
2020-12-29 10:53:48 +08:00
jiaoyangna fa46595132 Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-29 10:35:35 +08:00
jiaoyangna d389cb93f5 【优化】背包分类优化 2020-12-29 10:33:45 +08:00
ZhangBiao 927aa7053b .进入无尽副本上阵阵容之后推出副本,在挑战关卡、神将-编队无法上三星及以下英雄(不显示) 2020-12-29 10:28:10 +08:00
ZhangBiao 574a0da116 【编队】进入无尽副本后 主线编队无法上阵20级以下英雄修复 2020-12-29 10:24:50 +08:00
jiaoyangna 19d984a641 【优化】背包分类优化 2020-12-28 21:08:25 +08:00
jiaoyangna eba0a867da Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 20:10:50 +08:00
jiaoyangna a8bcdf14f4 【优化】道具不能使用0个,且优化道具使用多个的上限(目前20过少) 2020-12-28 20:10:45 +08:00
JieLing d86c2dc822 【资源修改】 2020-12-28 20:04:59 +08:00
ZhangBiao 136b2a4c18 【关卡界面】怎加挂机时间 2020-12-28 19:46:50 +08:00
zhangqiang f2ac961e39 【提交】 2020-12-28 19:46:44 +08:00
zhangqiang 66e2b0b25d 【新将来袭】资源引用丢失 2020-12-28 19:41:17 +08:00
JieLing 91cfcb8ccd 【资源文件夹】 2020-12-28 19:28:05 +08:00
JieLing f799c5432c 【资源调整】2 2020-12-28 18:59:53 +08:00
zhangqiang bbddb9e2ec 【资源调整】 2020-12-28 18:25:51 +08:00
ZhangBiao 9f3560471c Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 17:07:30 +08:00
ZhangBiao 56436bb4c3 【云梦祈福】1080*2460,重置按钮点击没反应 修改 2020-12-28 17:06:59 +08:00
jiaoyangna 2e3ac84814 【优化】背包中使用多个道具,明确标注数量 2020-12-28 16:40:32 +08:00
jiaoyangna 58111d30a2 Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 16:26:50 +08:00