wangzhenxing
|
c324157f04
|
删除_en资源
|
2024-01-21 18:11:39 +08:00 |
lihaiyang
|
138259e82e
|
嘲讽相关
|
2023-05-16 17:21:58 +08:00 |
wangzhenxing
|
402546b8ef
|
【战斗】=====buff图标提示文字资源提交
|
2021-12-03 18:34:40 +08:00 |
ZhangBiao
|
098ab986e4
|
【修行】meta提交
|
2021-05-19 20:43:16 +08:00 |
gaoxin
|
73f476a4e8
|
【资源】重复资源删除
|
2021-05-19 14:26:37 +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 |
jiaoyangna
|
3c04e8dbe1
|
[主题活动修改提交]
(cherry picked from commit f88ccd8f68 )
|
2021-05-12 17:37:59 +08:00 |
JLIOSM1
|
cab9724de6
|
【ios】资源位置修改
|
2021-04-20 13:57:33 +08:00 |
ZhangBiao
|
cce3a957f3
|
meta提交
|
2021-04-14 11:24:41 +08:00 |
JieLing
|
bfce2a542a
|
【资源】重名文件处理,meta文件提交
|
2021-04-12 22:06:58 +08:00 |
JieLing
|
9cd895e8e9
|
【资源处理】meta文件提交,文件压缩优化
|
2021-04-12 15:00:57 +08:00 |
gaoxin
|
495f588c2e
|
【logo】还原Logo
|
2021-04-09 16:35:36 +08:00 |
gaoxin
|
17c39e0d74
|
【本地化】翻译资源导入
|
2021-04-09 15:25:29 +08:00 |
gaoxin
|
601e1c0971
|
【本地化】资源文件压缩处理
|
2021-04-08 18:37:17 +08:00 |
zhangqiang
|
894a8bcfd4
|
【问题提交】
|
2021-04-07 19:52:25 +08:00 |
jiaoyangna
|
0c10418a3c
|
图片提交
|
2021-04-07 14:23:44 +08:00 |
gaoxin
|
cc077314c9
|
【本地化】翻译资源导入
|
2021-03-29 18:12:48 +08:00 |
jiaoyangna
|
decb1e6ff0
|
图片提交
|
2021-03-12 14:13:42 +08:00 |
JieLing
|
abd4028923
|
【meta】打包后meta文件上传
|
2021-03-09 16:04:18 +08:00 |
jiaoyangna
|
5bd35da17c
|
Revert "图片整理提交"
This reverts commit 988b881285 .
|
2021-03-09 14:37:14 +08:00 |
jiaoyangna
|
64062ba3cf
|
Revert "图片提交"
This reverts commit 6418f1280d .
|
2021-03-09 14:36:20 +08:00 |
jiaoyangna
|
6418f1280d
|
图片提交
|
2021-03-09 14:18:15 +08:00 |
jiaoyangna
|
988b881285
|
图片整理提交
|
2021-03-09 12:44:53 +08:00 |
gaoxin
|
6d7c2c0a25
|
【本地化】图片资源压缩
|
2021-03-08 16:53:16 +08:00 |
gaoxin
|
05c66c280a
|
【本地化】资源回滚
|
2021-03-07 15:41:26 +08:00 |
gaoxin
|
b8762232bc
|
【本地化】登录界面logo替换,不再扫光
|
2021-03-07 15:33:41 +08:00 |
gaoxin
|
abad647f16
|
【本地化】新增资源导入
|
2021-03-04 16:47:35 +08:00 |
gaoxin
|
265fb5684e
|
删除奇怪的资源文件
|
2021-03-04 16:44:55 +08:00 |
gaoxin
|
999010d8ca
|
冗余资源删除
|
2021-03-04 16:44:49 +08:00 |
jiaoyangna
|
7a6808a8d1
|
图片提交
|
2021-03-04 16:05:43 +08:00 |
jiaoyangna
|
cf5300bab2
|
图片提交
|
2021-03-03 17:46:08 +08:00 |
jiaoyangna
|
d429d11d29
|
图片提交
|
2021-03-03 16:26:10 +08:00 |
zhangqiang
|
aa0ccbc52c
|
【越南语】功能解锁
|
2021-02-27 18:14:39 +08:00 |
zhangqiang
|
843900d659
|
【越南语】修改
|
2021-02-27 17:59:07 +08:00 |
gaoxin
|
1715f44d48
|
【本地化】删除无用资源
|
2021-02-05 16:45:33 +08:00 |
liujiaqi
|
faa036bac9
|
【资源】牛转钱坤英文资源
|
2021-02-05 16:40:14 +08:00 |
gaoxin
|
2a16ca3b03
|
【本地化】资源修正
|
2021-02-04 19:40:17 +08:00 |
gaoxin
|
361d63b861
|
【本地化】资源修改
|
2021-02-04 17:28:00 +08:00 |
gaoxin
|
0f66637056
|
【本地化】新增图片资源
|
2021-02-02 18:06:19 +08:00 |
gaoxin
|
1380eedea2
|
【本地化】新增翻译资源
|
2021-02-02 16:51:21 +08:00 |
gaoxin
|
bf3a6eb705
|
【本地化】界面显示问题修复
|
2021-01-29 13:34:16 +08:00 |
gaoxin
|
898ba31ad5
|
【本地化】修复大闹天宫瑶池资源本地化导致白片的问题
|
2021-01-28 16:19:11 +08:00 |
gaoxin
|
871196a742
|
【本地化】资源提交
|
2021-01-26 17:56:55 +08:00 |