Commit Graph

60 Commits (b37d9625a97174cd1bca1c38287a82d3161bd226)

Author SHA1 Message Date
jiaoyangna b93f69cfa6 文字导出 2021-02-26 09:59:01 +08:00
jiaoyangna df38aea68e 巅峰赛修改 2021-02-25 14:20:29 +08:00
jiaoyangna e4f4649cf9 文本提交 2021-02-20 18:01:57 +08:00
jiaoyangna 602dbc924c 文本还原 2021-02-20 16:43:44 +08:00
gaoxin 78e7305c15 【本地化】导出中文 2021-02-05 15:58:37 +08:00
gaoxin 927025f6de 【本地化】中文字还原,合并用 2021-02-05 12:44:50 +08:00
gaoxin adf591cbec 【本地化】lua代码还原 2021-01-27 18:16:54 +08:00
gaoxin c567dcd426 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
gaoxin 81b3ca1ddc 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
gaoxin 802881378c Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
2021-01-26 11:08:54 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
guowei 344ec52500 【巅峰赛头像修改】 2021-01-18 15:07:23 +08:00
DESKTOP-98AVA47\Administrator 8f437f407d 【本周优化修改】 2021-01-15 22:11:38 +08:00
gaoxin f501e92272 【本地化】代码还原,合并用 2021-01-12 11:00:44 +08:00
gaoxin ae7da93056 【本地化】还原文字 2021-01-12 10:56:26 +08:00
gaoxin 27b3c1ea32 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
gaoxin 6c1a801779 Merge remote-tracking branch 'origin/gx/test_new' into master_xma_local 2021-01-09 13:54:01 +08:00
zhangqiang 9f9b2920e3 【战斗回放】 2021-01-08 19:19:01 +08:00
zhangqiang 7bedefc780 【战斗回放】 2021-01-06 16:12:54 +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 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
JieLing e8ea367a6e 【优化】scrollview setData不是回到顶部时不再播放动画 2020-12-30 16:45:52 +08:00
zhangqiang c79285e4ca 【竞技场】在线等待赛季刷新,攻击次数奖励异常-dev 2020-12-29 17:36:01 +08:00
zhangqiang 1227e93456 【寻宝】 优化 加锁 1 2020-12-29 16:56:18 +08:00
zhangqiang 90df5e453f 【竞技场】 1209bug 竞技场跳过战斗按钮,解锁条件同关卡 2020-12-10 13:37:44 +08:00
zhangqiang 1629164837 【竞技场】 防守记录积分显示修改 2021-01-19 23:00:35 +08:00
ZhangBiao 383fa08e90 【竞技场】赢了我加分对方减分,输了无变化
(cherry picked from commit 8f7cf8ca39dd8395a5b2b46eadb8d4f575289ce5)
2021-01-14 21:14:04 +08:00
zhangqiang 17882656fe 【竞技场】 修复积分规则修改别的pvp 战斗结束后报错 bug 2020-11-27 17:20:29 +08:00
ZhangBiao be9b79897e 【竞技场】增加产出 2020-11-25 18:23:33 +08:00
ZhangBiao d938acc273 【竞技场】增加输赢奖励掉落 2020-11-23 09:58:22 +08:00
ZhangBiao de32379f8e 【竞技场】竞技场增加输赢奖励 2020-11-07 18:52:04 +08:00
jiaoyangna e2fae0cc52 皮肤提交 2020-11-06 09:37:27 +08:00
JieLing cb6c7d393b 【竞技场】修复奖励不刷新2 2020-10-20 02:49:25 +08:00
JieLing 534ee58f6a 【竞技场】添加挑战次数显示,修复挑战后奖励显示不刷新的问题 2020-10-20 02:31:13 +08:00
jiaoyangna 93db6c028a 竞技场奖励显示错误 2020-10-20 00:21:08 +08:00
ZhangBiao 56f5856a71 宝箱个数减负 2020-10-19 20:10:53 +08:00
ZhangBiao 43201d2172 每日 赛季奖励 显示错误修复 2020-10-19 19:41:36 +08:00
ZhangBiao b52ebf46f4 竞技场 bug修改 2020-10-19 19:34:48 +08:00
ZhangBiao 4c5065ccf7 竞技场界面修改 2020-10-19 18:52:36 +08:00
ZhangBiao bae7d6550e 竞技场界面修改 2020-10-16 19:36:21 +08:00
gaoxin b3d15c1945 头像特效添加 2020-09-27 16:58:10 +08:00
ZhangBiao 14ce57d5f0 2020-09-03 17:54:13 +08:00
ZhangBiao 04b18aa4ad 竞技场有免费次数 时提示红点 2020-09-03 14:42:31 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
jiaoyangna d8fa2b9459 头像背景修改 2020-07-25 19:59:43 +08:00
jiaoyangna 064b819f4a 修改星星提交 2020-07-24 20:03:06 +08:00
zhangqiang 6a855cf7a2 巅峰赛问题修改 2020-07-23 20:39:21 +08:00
zhangqiang f844305e0e Merge branch 'master_develop' into master_arena
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
2020-07-22 21:55:01 +08:00
zhangqiang f234c1a174 竞技场中文字修改 2020-07-20 16:07:30 +08:00