ZhangBiao
|
d41ba9f65d
|
【主城】右侧伸缩条
|
2021-05-25 18:21:52 +08:00 |
ZhangBiao
|
cecea9b415
|
【修行】主界面 修行提交 1
|
2021-05-25 10:16:07 +08:00 |
ZhangBiao
|
be1085d2bb
|
Merge branch 'china/dev-c' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Atlas/ActivityAltas/r_huodong_tiao02.png.meta
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua
|
2021-05-19 20:01:57 +08:00 |
ZhangBiao
|
00cdcffd23
|
【修行】图片meta提交
|
2021-05-19 19:55:02 +08:00 |
gaoxin
|
ab4baa0420
|
【meta】
|
2021-05-19 19:46:52 +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 |
ZhangBiao
|
9b1c6ac930
|
【修行】资源提交
|
2021-05-18 21:00:38 +08:00 |
jiaoyangna
|
ed41c4cf3c
|
成长礼包
|
2021-05-13 11:52:04 +08:00 |
jiaoyangna
|
f88ccd8f68
|
[主题活动修改提交]
|
2021-05-10 10:06:53 +08:00 |
gaoxin
|
bc441f50e3
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 22:40:30 +08:00 |
gaoxin
|
059535bbc0
|
【资源】新增法宝资源,玄黄之气资源替换,玉帝技能文字替换
|
2021-04-27 22:40:20 +08:00 |
wangzhenxing
|
0a6be18474
|
成长礼包banner替换回之前的
|
2021-04-27 22:34:18 +08:00 |
ZhangBiao
|
4e0b5a9033
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 21:17:51 +08:00 |
ZhangBiao
|
8e72485e7b
|
【累计充值】资源替换
|
2021-04-27 21:17:42 +08:00 |
gaoxin
|
3616fba4fb
|
【副本banner】还原
|
2021-04-27 20:53:32 +08:00 |
wangzhenxing
|
bbbf5598d6
|
立绘图片资源替换
|
2021-04-26 11:11:46 +08:00 |
wangzhenxing
|
278282f73e
|
[图片]==============替换立绘图片资源
|
2021-04-23 17:45:39 +08:00 |
ZhangBiao
|
eab420381c
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-21 15:02:04 +08:00 |
zhangqiang
|
6baba16701
|
【四元阵】将四元阵神将展示替换为原海外版
|
2021-04-21 11:45:08 +08:00 |
JLIOSM1
|
cab9724de6
|
【ios】资源位置修改
|
2021-04-20 13:57:33 +08:00 |
ZhangBiao
|
48720f5dff
|
【新人商城】资源提交
(cherry picked from commit 8922b7eaba )
|
2021-04-17 14:03:35 +08:00 |
ZhangBiao
|
6064633a28
|
【云游商人】资源提交
|
2021-04-16 11:12:17 +08:00 |
ZhangBiao
|
8922b7eaba
|
【新人商城】资源提交
|
2021-04-14 12:00:06 +08:00 |
ZhangBiao
|
f1864ae6cf
|
Revert "【每日累充】banner和按钮资源替换"
This reverts commit c34a3fcc24 .
|
2021-04-13 16:54:48 +08:00 |
ZhangBiao
|
c34a3fcc24
|
【每日累充】banner和按钮资源替换
|
2021-04-13 13:46:09 +08:00 |
zhangqiang
|
6b153fc680
|
【三张资源替换】
|
2021-03-18 19:30:54 +08:00 |
zhangqiang
|
7cc397c43f
|
【资源替换】技能新字替换
|
2021-03-17 14:58:54 +08:00 |
ZhangBiao
|
86fdb9395b
|
Merge branch '0功能/本周版本优化内容' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
|
2021-03-15 10:51:17 +08:00 |
zhangqiang
|
6fcd6778cc
|
【资源替换】
|
2021-03-12 10:28:56 +08:00 |
JieLing
|
abd4028923
|
【meta】打包后meta文件上传
|
2021-03-09 16:04:18 +08:00 |
jiaoyangna
|
0b5afbc4ea
|
Revert "删除 有_zh的图片的 没有加后缀的 图片"
This reverts commit 72998061d8 .
|
2021-03-09 14:36:27 +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
|
72998061d8
|
删除 有_zh的图片的 没有加后缀的 图片
|
2021-03-09 14:08:19 +08:00 |
zhangqiang
|
9f1b0aa44b
|
【本地化】
|
2021-03-05 15:55:54 +08:00 |
zhangqiang
|
0af293c7d9
|
【巅峰赛 部分】
|
2021-03-05 15:12:15 +08:00 |
ZhangBiao
|
f36126d291
|
【本地化】雷震子技能百篇
|
2021-03-02 15:22:51 +08:00 |
ZhangBiao
|
9a528217d8
|
【本地化】观音技能白片
|
2021-03-01 11:15:15 +08:00 |
gaoxin
|
169ad402c7
|
【本地化】修复白片得问题
|
2021-02-23 19:12:16 +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 |
jiaoyangna
|
21321eeede
|
【优化】修改四灵阵界面的宣传人物图片
|
2020-12-30 18:17:26 +08:00 |
gaoxin
|
8c86335070
|
【资源】三四星技能音效添加,孟姜女立绘修改
|
2020-11-27 18:04:14 +08:00 |
JieLing
|
04ba352791
|
【资源】 修改资源路径
|
2020-11-02 19:54:12 +08:00 |
gaoxin
|
23253f96a2
|
【社稷大典】名字重复的资源处理
|
2020-11-01 16:23:08 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
zhangqiang
|
f2d3f045aa
|
森罗幻境提交1
|
2020-10-12 14:46:05 +08:00 |
zhangqiang
|
c668a522dd
|
寻宝缺失资源提交
|
2020-09-29 10:46:57 +08:00 |
jiaoyangna
|
124fc753a0
|
达人图片提交
|
2020-09-29 10:32:57 +08:00 |
liujiaqi
|
783c61eed8
|
修复新玩家登陆卡在登陆100%
|
2020-09-27 20:40:20 +08:00 |
zhangqiang
|
bd6fdce461
|
遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-27 16:12:21 +08:00 |
altair
|
bf38fd1ab6
|
修改技能图片
|
2020-09-07 11:54:03 +08:00 |
gaoxin
|
d05b5d43f1
|
android p 以上机型屏幕适配添加
|
2020-09-05 15:21:41 +08:00 |
zhangqiang
|
6b55198f12
|
周月礼包替图
|
2020-09-04 18:35:30 +08:00 |
zhangqiang
|
bbd5d3bda2
|
成长基金
|
2020-09-04 17:50:50 +08:00 |
gaoxin
|
30697705be
|
每次销毁界面时清理一次不用的资源,界面打开音效配置添加
|
2020-09-04 10:03:35 +08:00 |
altair
|
888078a2ef
|
替换技能文字图片资源
|
2020-08-27 20:17:25 +08:00 |
altair
|
6fb7e80803
|
修改技能字
|
2020-08-27 16:50:52 +08:00 |
JieLing
|
611bf1a91a
|
删除错误资源
|
2020-08-27 12:01:33 +08:00 |
gaoxin
|
4b41b5def9
|
副本界面显示优化
|
2020-08-26 20:20:40 +08:00 |
JieLing
|
b28309e14e
|
资源位置移动
|
2020-08-25 19:26:51 +08:00 |
gaoxin
|
74951cedd8
|
修复登录界面错误,修复战斗背景音乐缺失的问题
|
2020-08-24 14:35:45 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
liujiaqi
|
911d3fabf9
|
新英雄资源及技能名称资源替换
|
2020-08-18 20:35:51 +08:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +08:00 |
ZhangBiao
|
2063690199
|
|
2020-08-14 23:34:23 +08:00 |
JieLing
|
7453825d63
|
Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
# Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
# Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
# Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
# Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
# Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
|
2020-08-14 17:41:21 +08:00 |
JieLing
|
5e9448dd24
|
资源提交,
|
2020-08-14 17:35:18 +08:00 |
JieLing
|
ad3ee94a75
|
资源压缩方式修改,苹果资源压缩方式添加,
|
2020-08-14 17:29:06 +08:00 |
jiaoyangna
|
e88e7544c2
|
通关豪礼替换
|
2020-08-14 14:41:29 +08:00 |
jiaoyangna
|
3834e1960e
|
图片导入
|
2020-08-14 14:17:38 +08:00 |
JieLing
|
be59c59230
|
部分大图资源整理
|
2020-08-14 10:02:24 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
JieLing
|
acf9a73068
|
重复引用资源修改
|
2020-08-13 19:40:50 +08:00 |
jl_ios
|
02b7e07d20
|
删除无用的sdk资源,bugly添加缺少的文件
|
2020-08-11 14:04:05 +08:00 |
gaoxin
|
48a39d2fae
|
游戏logo替换
|
2020-07-28 10:40:02 +08:00 |
JieLing
|
6807c6c1a6
|
meta文件提交
|
2020-07-25 15:15:16 +08:00 |
JieLing
|
89169b7291
|
资源文件名重复
|
2020-07-25 14:45:27 +08:00 |
jiaoyangna
|
b424927bbb
|
tupian tijiao
|
2020-07-23 16:01:26 +08:00 |
zhangqiang
|
b682f97e66
|
首充第一版修改
|
2020-07-15 10:36:57 +08:00 |
liujiaqi
|
b61fc5fb1e
|
法宝资源
|
2020-07-10 16:50:00 +08:00 |
JieLing
|
7382b2db77
|
版本开发提交
|
2020-06-28 17:52:29 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
75a3f83194
|
内网0.15.16 外网 0.16.7
|
2020-06-19 20:19:35 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
ab3dbad074
|
测试服热更0.15.6提交
|
2020-06-05 16:16:22 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
6019de7c1e
|
外网0.16.2
|
2020-05-25 19:55:27 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
00892194b5
|
提交
|
2020-05-11 09:38:52 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |