wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
wangzhenxing
|
7de5fdac9e
|
[飞升]=====特效问题修改
|
2022-01-20 17:58:57 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |
ZhangBiao
|
76b7b5caca
|
【log】提交
|
2021-11-08 15:59:56 +08:00 |
jiaoyangna
|
e35ded2b5d
|
巅峰赛星级修改提交
|
2021-11-05 14:08:35 +08:00 |
jiaoyangna
|
cdd6baeb5f
|
巅峰赛星星修改提交
|
2021-11-05 13:35:14 +08:00 |
jiaoyangna
|
f9f92262a8
|
巅峰赛神魂图标提交
|
2021-11-04 11:35:15 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
gaoxin
|
5e938b5141
|
【巅峰赛】选拔赛组界面添加角色信息展示-修复查看编队是主线编队的问题
|
2021-09-09 10:45:40 +08:00 |
gaoxin
|
b953fac2a0
|
【巅峰赛】选拔赛组界面添加角色信息展示
|
2021-09-06 17:58:31 +08:00 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
zhangqiang
|
667e53769a
|
【巅峰赛】8强界面不显示玩家名字
|
2021-06-17 20:53:33 +08:00 |
ZhangBiao
|
458ab29053
|
【清除Log】清楚部分Log
|
2021-05-28 10:33:53 +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
|
2df3ac159c
|
【限时活动】完成?删除loggreen
|
2021-04-21 16:36:12 +08:00 |
gaoxin
|
30b329a837
|
【ios】图片回收
|
2021-04-21 13:12:04 +08:00 |
JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
jiaoyangna
|
071a91773a
|
导出 文本提交
|
2021-04-09 12:26:35 +08:00 |
jiaoyangna
|
0ab7c3177a
|
还原文字提交
|
2021-04-09 12:06:17 +08:00 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |
gaoxin
|
cf5a2a46fa
|
【本地化】还原文本到代码种
|
2021-04-06 15:23:27 +08:00 |
zhangqiang
|
855c7159b8
|
【巅峰赛】尝试修改去掉注释
|
2021-04-02 16:01:26 +08:00 |
zhangqiang
|
c45d20f9da
|
【巅峰赛】尝试修改
|
2021-04-02 15:47:07 +08:00 |
zhangqiang
|
7bea1cf11a
|
【巅峰赛】尝试修改
|
2021-04-02 15:42:36 +08:00 |
zhangqiang
|
fc95cfb52c
|
【巅峰赛 bug】 三局两胜 第三场不刷新bug 3
|
2021-04-02 09:55:55 +08:00 |
zhangqiang
|
881cc1717b
|
【巅峰赛 bug】 三局两胜 第三场不刷新bug +2
|
2021-04-02 09:55:32 +08:00 |
jiaoyangna
|
579f2806c3
|
竞技守卫名字修改提交
(cherry picked from commit d3efa809d8 )
|
2021-03-12 16:35:55 +08:00 |
jiaoyangna
|
838de7cd1c
|
文字提交
|
2021-03-12 14:31:52 +08:00 |
jiaoyangna
|
1cd3d4cdaa
|
文字提交
|
2021-03-12 14:20:14 +08:00 |
jiaoyangna
|
2a6a2e69da
|
图片提交,巅峰赛竞技守卫名字提交
|
2021-03-12 12:08:24 +08:00 |
zhangqiang
|
ea3ad6d934
|
【本地化】
|
2021-03-05 16:26:39 +08:00 |
zhangqiang
|
0af293c7d9
|
【巅峰赛 部分】
|
2021-03-05 15:12:15 +08:00 |
jiaoyangna
|
b3af8709ae
|
巅峰赛帮助文本修改
|
2021-03-04 14:28:46 +08:00 |
ZhangBiao
|
ff70c8d635
|
【本地化】竞技场 积天豪礼
|
2021-03-03 10:07:13 +08:00 |
jiaoyangna
|
d81075da7a
|
还原lua
|
2021-03-02 16:53:12 +08:00 |
jiaoyangna
|
88e59e0c7c
|
lua 提交
|
2021-03-02 15:49:02 +08:00 |
jiaoyangna
|
571591eb81
|
竞技场修改提交
|
2021-03-02 11:59:01 +08:00 |
ZhangBiao
|
54cfbac8fa
|
【本地化】巅峰赛白片
|
2021-03-02 10:57:07 +08:00 |
zhangqiang
|
d7f3fc25dd
|
语法错误
|
2021-03-01 16:56:52 +08:00 |
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
|
9559607b51
|
【本地化】部分扫光特效处理,充值界面妖精文字改图标
|
2021-01-28 15:37:44 +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 |