Commit Graph

2773 Commits (50de01d5a073ac275568885ba65487b906e04800)

Author SHA1 Message Date
ZhangBiao 3dc7618b04 【车迟斗法】boss位置调整3 2021-01-08 19:25:13 +08:00
ZhangBiao 97141341db 【车迟斗法】boss位置调整2 2021-01-08 19:25:03 +08:00
ZhangBiao bdab3b511d 【车迟斗法】boss位置调整 2021-01-08 19:24:56 +08:00
zhangqiang d45aae1c64 【资源导入】灵兽宝阁 金乌文字 2021-01-08 19:24:46 +08:00
zhangqiang f6c9456b8c 【资源导入】 灵兽 金乌 live2d and 三个音效 2021-01-08 19:24:00 +08:00
jiaoyangna 400376f7b7 【战斗回放】按钮显示修改 2021-01-08 19:23:53 +08:00
zhangqiang bd14d812a3 【战斗回放】bug 2021-01-08 19:23:31 +08:00
jiaoyangna b63c18ac53 【ID1007772】
【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励
2021-01-08 19:23:23 +08:00
jiaoyangna d7dfdfcb2e 铜墙铁壁 2021-01-08 19:23:09 +08:00
DESKTOP-98AVA47\Administrator 94f8e8c9f9 【送神祀】优化修改 2021-01-08 19:22:58 +08:00
zhangqiang e12211eee4 【战斗回放】代码整理 2021-01-08 19:22:16 +08:00
zhangqiang 41ffad0c78 【战斗回放】车迟 十绝阵 2021-01-08 19:20:07 +08:00
zhangqiang 9f9b2920e3 【战斗回放】 2021-01-08 19:19:01 +08:00
ZhangBiao 657fe80519 【工会祭祀】提示文字 5点改0点 2021-01-08 19:16:48 +08:00
DESKTOP-98AVA47\Administrator e3ffcb23b8 【(送神祠)选择属性筛选后进行恭送神将、神将归元、法宝归元、宝物分解优化】 2021-01-08 19:16:22 +08:00
zhangqiang 54ffbe55fc 【重置优化】将游戏中的各个玩法重置时间统一调整至0点 2021-01-08 19:15:08 +08:00
jiaoyangna dc661f677f 【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励 2021-01-08 19:15:01 +08:00
jiaoyangna 8a7e2ebcef 【优化】修改公会图腾功能 2021-01-08 19:14:40 +08:00
ZhangBiao 4a90f8838e 【降妖夺宝】取消抽卡前摇
(cherry picked from commit c84656e705)
2021-01-08 19:08:55 +08:00
ZhangBiao d09bc60b5e 【森罗幻境】红点刷新修改 2021-01-08 19:08:04 +08:00
ZhangBiao 554adfa3bc 【森罗幻境】红点刷新修改
(cherry picked from commit 31c5aa7580)
2021-01-08 19:05:22 +08:00
guowei 3ded7b31fc 【鸿蒙阵修改】 2021-01-08 17:29:54 +08:00
guowei f28818d4aa 【鸿蒙阵修改】 2021-01-07 21:45:22 +08:00
JieLing 14f5a85577 【bug】删除显示活动按钮多余的判断 2021-01-07 18:30:32 +08:00
guowei 83316e4724 【鸿蒙阵协议】 2021-01-07 15:31:33 +08:00
JieLing 6dea99ece5 Merge branch 'gx/test_new' of http://60.1.1.230/gaoxin/JL_Client into gx/test_new 2021-01-07 11:25:29 +08:00
guowei 952120a5fe 【鸿蒙阵新手引导】 2021-01-07 11:07:20 +08:00
ZhangBiao 06ec0f40eb 【抽卡】降妖夺宝 2021-01-06 20:36:18 +08:00
ZhangBiao b960e57716 【抽卡】降妖夺宝抽卡显示错误修改 2021-01-06 20:34:09 +08:00
guowei 6c191263bd Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Expedition.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
2021-01-06 20:05:35 +08:00
guowei a5109cd144 【鸿蒙阵bug修改】 2021-01-06 19:35:41 +08:00
Fuhaifeng 18642e01ae LUA 中校验被提出的合理检查 2021-01-06 17:35:48 +08:00
guowei e6de436a76 【鸿蒙阵修改】 2021-01-06 15:57:17 +08:00
ZhangBiao 524e502773 【0106抽卡修复】普通抽卡报错修复
(cherry picked from commit 254b22a75a893eaf9b1e792b83881e61f8e43d0f)
2021-01-06 14:00:13 +08:00
guowei cf40154bb6 【鸿蒙阵修改】 2021-01-06 13:51:29 +08:00
guowei c428fc1fa9 【鸿蒙阵需求修改】 2021-01-06 11:48:29 +08:00
guowei d42cbc0a34 【鸿蒙阵bug修改】 2021-01-06 11:16:10 +08:00
guowei e94bbe1641 【鸿蒙阵bug修改】 2021-01-06 10:21:55 +08:00
guowei 0eae27d30d 【鸿蒙阵bug修改】 2021-01-06 10:03:38 +08:00
guowei 088e19b73e 【鸿蒙阵修改】 2021-01-05 20:44:14 +08:00
DESKTOP-98AVA47\Administrator e5b2be7e81 【鸿蒙阵修改】 2021-01-12 00:55:02 +08:00
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
guowei 8a3eb5aab8 【鸿蒙阵成就补充】 2021-01-05 14:26:26 +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
guowei 4d951b38bd 【鸿蒙阵成就】 2021-01-05 10:46:35 +08:00
guowei 94f549f605 【鸿蒙阵成就 任务】 2021-01-04 19:40:39 +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
zhangqiang 33a7491279 【bug】 2021-01-04 16:47:04 +08:00
guowei 6fe2339153 【鸿蒙阵需求修改】 2021-01-04 16:31:46 +08:00
ZhangBiao 71c18b1e94 狭路相逢 2021-01-04 15:52:13 +08:00
guowei cc337cbcb3 【鸿蒙阵】 2021-01-04 15:27:19 +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
ZhangBiao 2fed5ddb45 【森罗幻境】进入森罗幻境后直接关闭选择神将弹窗,会在离开幻境前闪过一个统计弹窗 修复 2021-01-04 11:04:37 +08:00
ZhangBiao fc8f74cd3a 【森罗幻境】在进入下一层后,下方的神将头像位置会发生变化 修复 2021-01-04 10:41:35 +08:00
guowei 30b0c26a6e 【鸿蒙阵】 2021-01-04 09:57:42 +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
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
JieLing fca9bfccfc 【优化】修复周月礼包不显示在最上面 2020-12-30 15:04:30 +08:00
guowei 544be95060 【预制体修改】 2020-12-30 14:51:16 +08:00
guowei a24850e51b 【鸿蒙阵修改】 2020-12-30 14:50:38 +08:00
JieLing f3c1a2297a 【bug】修复scrollview修改导致引导报错的问题 2020-12-30 14:41:27 +08:00
JieLing 15099f1e09 【修复】寻宝界面显示错误 2020-12-30 14:26:37 +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
gaoxin 5c69617c48 【优化】ui管理删除多余的层级管理 2020-12-29 20:46:03 +08:00
gaoxin 816351d73e 【优化】网络层优化-峰哥 2020-12-29 20:45:56 +08:00
gaoxin 9f691e4e05 【优化】scrollview分帧加载-游戏内适应性修改 2020-12-29 20:37:57 +08:00
guowei ca9a6a933b 【鸿蒙阵修改】 2020-12-29 20:36:37 +08:00
gaoxin 962c41e11c 【优化】scrollview改为分帧加载 2020-12-29 20:35:28 +08:00
zhangqiang c79285e4ca 【竞技场】在线等待赛季刷新,攻击次数奖励异常-dev 2020-12-29 17:36:01 +08:00