jiaoyangna
|
b36edb9ae9
|
资源导入工具修改提交
|
2021-07-05 18:52:37 +08:00 |
jiaoyangna
|
c6963b337c
|
添加音频导入工具
|
2021-07-05 16:43:19 +08:00 |
jiaoyangna
|
bc4d6fb744
|
资源导入工具修改提交
(cherry picked from commit e587f6d35d7b4b592e1785c1aa9bc27c190a0e0e)
|
2021-07-05 16:32:40 +08:00 |
wangzhenxing
|
fd3b2c0ed6
|
[战斗]=============减怒数字图片字修改提交,生成材质球文本文件修改提交
|
2021-07-03 18:52:28 +08:00 |
zhangqiang
|
c87576944f
|
【刷资源提交】
|
2021-07-03 17:02:18 +08:00 |
wangzhenxing
|
6ad90cf3cf
|
[战斗]==========伤害文字修改提交
|
2021-07-03 15:50:58 +08:00 |
jiaoyangna
|
cf412831e2
|
buildconfig 脚本提交
|
2021-07-02 16:24:50 +08:00 |
jiaoyangna
|
5bd477fbab
|
config 修改提交
|
2021-07-02 13:05:29 +08:00 |
gaoxin
|
318323e50d
|
【配置】新增硬核渠道配置
|
2021-06-28 14:12:13 +08:00 |
gaoxin
|
8085adfe25
|
【工具】同步战斗校验服,添加未进版本的文件
|
2021-06-28 10:27:08 +08:00 |
gaoxin
|
da16945d78
|
【工具】同步战斗校验服代码添加,提交需svn命令行工具
https://www.visualsvn.com/files/Apache-Subversion-1.14.1.zip
|
2021-06-26 19:52:08 +08:00 |
gaoxin
|
9d0c42f0ca
|
【配置】添加硬核渠道,先遣打包配置,热更删除默认密码
|
2021-06-24 13:54:48 +08:00 |
jiaoyangna
|
8b3e5dbae4
|
config build 提交
|
2021-06-22 20:41:51 +08:00 |
jiaoyangna
|
97da91abc3
|
buildconfig 修改提交
|
2021-06-22 20:37:34 +08:00 |
gaoxin
|
e88dcb7863
|
【热更】脚本优化,添加自动打tag的功能
|
2021-06-18 16:03:27 +08:00 |
gaoxin
|
12bd0b64a1
|
Merge branch 'china/zf_test' into china/dev-c
# Conflicts:
# Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
|
2021-06-17 10:26:13 +08:00 |
gaoxin
|
fbd02f1a29
|
【工具】热更和打包工具完成后自动提交
|
2021-06-16 11:47:07 +08:00 |
gaoxin
|
0814f45cfa
|
【热更】先遣服相关热更配置添加,腾讯云路径刷新功能添加
|
2021-06-16 11:47:00 +08:00 |
gaoxin
|
eb27240907
|
【热更】修复草花cdn报错
|
2021-06-11 19:26:20 +08:00 |
gaoxin
|
2a945825d9
|
【热更】修复草花cdn报错
|
2021-06-11 19:24:04 +08:00 |
gaoxin
|
57ece39059
|
【热更】添加草花和灵动专服的配置
|
2021-06-11 18:28:32 +08:00 |
gaoxin
|
c9d6c66259
|
【热更】添加草花和灵动专服的配置
|
2021-06-11 18:02:42 +08:00 |
gaoxin
|
3ba5186b7b
|
【热更】没有更新 files文件
|
2021-06-11 13:19:22 +08:00 |
gaoxin
|
ee8577248e
|
【热更】没有更新 files文件
|
2021-06-11 13:16:55 +08:00 |
gaoxin
|
9ec33b5c6d
|
【热更】添加测试服和喜扑的配置
|
2021-06-11 13:04:29 +08:00 |
gaoxin
|
41af3c5db2
|
【热更新工具】
|
2021-06-11 13:04:22 +08:00 |
gaoxin
|
65e7971693
|
【热更】添加测试服和喜扑的配置
|
2021-06-11 13:02:12 +08:00 |
gaoxin
|
7cb79b4de3
|
【热更新工具】
|
2021-06-11 12:46:14 +08:00 |
JieLing
|
530374e00b
|
【资源】循环引用资源优化
|
2021-06-10 22:53:11 +08:00 |
gaoxin
|
a943681b63
|
【工具】热更工具添加同步GIT的功能
|
2021-06-10 10:32:10 +08:00 |
jiaoyangna
|
f0b9e1d8e6
|
Revert "玲珑宝镜提交"
This reverts commit 8c0a90ef78.
|
2021-06-09 17:09:14 +08:00 |
jiaoyangna
|
8c0a90ef78
|
玲珑宝镜提交
|
2021-06-09 17:07:48 +08:00 |
gaoxin
|
24ebb4cf9e
|
【热更工具】添加查看热更文件的界面
|
2021-06-07 10:39:27 +08:00 |
gaoxin
|
8451c96e70
|
【工具】添加多选文件工具
|
2021-06-03 21:32:44 +08:00 |
ZhangBiao
|
1270be7823
|
【登录界面】增加视频
|
2021-06-02 17:52:26 +08:00 |
gaoxin
|
d311f479a4
|
【工具】热更工具添加
|
2021-05-31 11:24:20 +08:00 |
gaoxin
|
4a44d87c27
|
【测试】打包速度测试接口
|
2021-05-27 13:32:44 +08:00 |
gaoxin
|
7dede46133
|
【version】不再保存到resources路径
|
2021-05-26 13:43:49 +08:00 |
gaoxin
|
00d42ca8d9
|
【本地化】导出lua文本时,不再对没有变化的文件进行写操作
|
2021-05-19 19:47:39 +08:00 |
gaoxin
|
a092534a16
|
【工具】图片整理工具优化
|
2021-05-19 16:06:43 +08:00 |
gaoxin
|
989361e574
|
Merge branch 'china/ios' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
|
2021-05-19 15:15:13 +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
|
83697a9de4
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-18 20:53:23 +08:00 |
gaoxin
|
d084904f33
|
【公告】修改公告通道的配置位置
|
2021-05-18 16:19:36 +08:00 |
gaoxin
|
1da9223506
|
【公告】修改公告的字段名,version工具添加公告配置
|
2021-05-18 15:37:37 +08:00 |
wangzhenxing
|
51392f0a62
|
服务器战斗逻辑同表工具修改
|
2021-05-17 10:21:23 +08:00 |
gaoxin
|
fff810429e
|
【工具】战斗数据表同步工具添加
|
2021-04-30 14:37:01 +08:00 |
jiaoyangna
|
0999af8061
|
资源提交
|
2021-04-22 15:07:18 +08:00 |
gaoxin
|
30b329a837
|
【ios】图片回收
|
2021-04-21 13:12:04 +08:00 |
JLIOSM1
|
56d849c6a1
|
【ios】添加图片回收机制,子物体不再从缓存池中创建,修改commonatlas到dy文件夹
|
2021-04-20 17:13:10 +08:00 |