Commit Graph

3574 Commits (d5c6d690b0c01d452595be81af52b4f96e5583d6)
 

Author SHA1 Message Date
JieLing c9ae0e833a Merge branch 'master_xma_test' into gx/test_new 2021-01-05 18:12:37 +08:00
JieLing 3722a9a3f2 Merge branch 'master_xma_local' into master_xma_test 2021-01-05 16:33:42 +08:00
ZhangBiao 7cb9252f45 【礼包刷新】修复礼包刷新问题 2021-01-05 16:29:13 +08:00
DESKTOP-98AVA47\Administrator 238c0706c0 【(送神祠)选择属性筛选后进行恭送神将、神将归元、法宝归元、宝物分解优化】 2021-01-05 14:29:33 +08:00
JieLing 03cdc9cf55 Merge branch 'master_xma_test' into gx/test_new
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
2021-01-05 14:23:00 +08:00
zhangqiang c96aedc923 Merge branch 'master_xma_local' into 0功能/本周版本优化内容 2021-01-05 10:33:58 +08:00
Fuhaifeng 3819ed162a //确保 关闭Client的链接状态。 2021-01-04 19:41:01 +08:00
Fuhaifeng fd7f19c8ec 偶尔出现的 同设备登录BUG, 通过SocketClient重新链接后的的安全甄别 2021-01-04 18:53:46 +08:00
JieLing 2c15faa4a4 【森罗】跳转 2021-01-04 18:29:41 +08:00
JieLing b995971610 【森罗】跳转 2021-01-04 18:29:20 +08:00
JieLing 8c7c3f5cee Merge branch 'master_xma_local' into master_xma_test 2021-01-04 18:14:16 +08:00
JieLing cdd6f979c8 【狭路相逢】资源调整位置 2021-01-04 18:13:16 +08:00
ZhangBiao 70a85609df 【无尽副本】报错修改
(cherry picked from commit 43cfaf3d1054adca7f6284a0de38c2383678aa6e)
2021-01-04 17:00:24 +08:00
gaoxin 0a32818c92 Merge remote-tracking branch 'origin/0功能/1月6_版本优化' into master_xma_local 2021-01-04 16:57:31 +08:00
zhangqiang 33a7491279 【bug】 2021-01-04 16:47:04 +08:00
gaoxin a13386674b Merge remote-tracking branch 'origin/0功能/1月6_版本优化' into master_xma_local 2021-01-04 16:32:17 +08:00
ZhangBiao 71c18b1e94 狭路相逢 2021-01-04 15:52:13 +08:00
ZhangBiao 8187dce467 狭路相逢 2021-01-04 15:21:46 +08:00
ZhangBiao 74cec8e7b4 【无尽副本】偶现卡死尝试修改 2021-01-04 15:13:21 +08:00
ZhangBiao dfafed683d 【乾坤宝盒】点击商店报错修改 2021-01-04 15:04:24 +08:00
zhangqiang ed65735dc5 【重置优化】将游戏中的各个玩法重置时间统一调整至0点 2021-01-04 14:27:18 +08:00
jiaoyangna 80229417d4 【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励 2021-01-04 11:42:09 +08:00
jiaoyangna c1c15d6c8b 四灵试炼 2021-01-04 11:39:58 +08:00
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
Fuhaifeng f4cc0e0d63 no message 2020-12-31 16:23:22 +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
JieLing b1cd14be3e Merge branch 'master_xma_local' into master_xma_test 2020-12-31 13:51:33 +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
JieLing a1d52ccac0 【优化】优化公会和编队列表刷新规则 2020-12-30 20:27:26 +08:00
JieLing af7e202ea9 【优化】部分界面动画效果优化 2020-12-30 19:51:14 +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
JieLing 83fa0d7f85 【优化】热更新界面显示优化 2020-12-30 17:24:43 +08:00
JieLing 1b6c9e6515 【反沉迷提示】还外包删除防沉迷提示 2020-12-30 17:24:06 +08:00
JieLing 4d983406f3 【bug】修复魂印穿戴报错 2020-12-30 17:03:12 +08:00
JieLing e8ea367a6e 【优化】scrollview setData不是回到顶部时不再播放动画 2020-12-30 16:45:52 +08:00
jiaoyangna 223c23f4bd [狭路相逢] 提交 2020-12-30 15:56:11 +08:00
JieLing ef3c269876 【优化】scrollview SetData接口默认回到顶部 2020-12-30 15:55:46 +08:00