Commit Graph

196 Commits (ca8bdf85ff08855b27370302f89b815dbcc5516f)

Author SHA1 Message Date
PC-202302260912\Administrator 09d582af1e 立绘 2023-08-15 19:11:44 +08:00
lihaiyang f595ebee5b 修改称号等美术图标 2023-06-02 13:18:06 +08:00
lihaiyang 63fc1c6ee2 【天蓬】图标 2023-05-16 11:49:23 +08:00
lihaiyang 7da600c422 新将图标 2023-04-19 17:37:23 +08:00
lihaiyang 53f92c1562 【新将图标】 2023-04-17 17:26:50 +08:00
lihaiyang c3bac10fc9 添加神兵技能图片 2023-04-04 18:02:54 +08:00
lihaiyang 480e7b1cbe 添加女娲图片 2023-03-01 11:28:06 +08:00
lihaiyang 330fe63d9f 女娲相关 2023-02-28 18:14:52 +08:00
lihaiyang 69d1882c7d 新增新将技能图标 2023-02-28 15:55:01 +08:00
wangzhenxing 0708630890 新英雄 ===================雨女资源提交 2023-02-28 10:59:28 +08:00
lihaiyang 171fbe8d90 雨女法宝图片 2023-02-23 18:46:00 +08:00
lihaiyang 0b4b59e542 称号=====永结同心 2023-02-13 16:40:15 +08:00
lihaiyang b8f1abd4b8 添加法相图标 2023-02-13 13:55:28 +08:00
yuanshuai 5005e8da5f 挂机战斗修改 2022-11-24 18:28:48 +08:00
lihaiyang 1e10db9fe0 【道具】=======变身卡升星所需道具图标 2022-11-01 11:43:56 +08:00
lihaiyang a688cd5ffe 魂印冲榜称号 2022-10-31 16:51:37 +08:00
lihaiyang dcb2321134 【称号】=============开服冲榜称号上传 2022-10-21 17:04:15 +08:00
lihaiyang dbe58e993e [gm]=======称号提交 2022-09-22 11:45:28 +08:00
yuanshuai d952b9a44c 数字游戏模块提交 2022-07-11 15:43:04 +08:00
wangzhenxing 3540b7b291 [资源]=====寻仙石提交 2022-05-23 12:18:05 +08:00
lihaiyang 83f7449bc0 添加两个技能图标 2022-04-12 21:35:40 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
luyao 9a209c865b 化身石、化身之力 图标上传 2022-04-20 20:58:26 +08:00
yuanshuai c5b0d30f9c 资源提交 2022-04-19 13:39:48 +08:00
luyao 77ac1e27cf 神印图标(13个) 及 神印石图标(1个)上传,共14个 2022-04-18 13:53:46 +08:00
jiaoyangna e8e381fb98 图片meta文件提交 2022-03-29 16:47:21 +08:00
luyao 4d58acef1e 阎魔王 法宝图标 2022-03-15 16:47:06 +08:00
luyao 2c3673ba94 新增【神魔将】小头像,半身头像 2022-03-14 14:07:10 +08:00
gaoxin a44c0cffab 【资源】临时技能图标优化 2022-01-17 18:27:10 +08:00
ZhangBiao 9d8586008d 【家园】资源替换 2022-01-14 17:51:56 +08:00
gaoxin a119734ba8 [meta] 2022-01-13 17:55:12 +08:00
lihaiyang 228efd4109 4个法宝图标 2022-01-13 15:17:17 +08:00
lihaiyang 8aef1e33ed 被动图标 2022-01-13 13:27:30 +08:00
ZhangBiao 48901f3817 【寻仙招募】心愿单中添加飞升石道具 2022-01-12 18:27:16 +08:00
zhangshanxue 18c1ef2de1 【物品】浮生门物品资源路径需修改 2022-01-14 17:23:40 +08:00
lihaiyang 066d55fcc1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 16:38:11 +08:00
lihaiyang 2a47ffda3f 替换两个图标 2022-01-11 16:33:50 +08:00
jiaoyangna a01485ebab 资源提交 2022-01-11 15:36:17 +08:00
lihaiyang 875da0fe84 被动技能临时图标 2022-01-11 15:05:13 +08:00
jiaoyangna 6ca1e17d52 【ID1010994】
增加单笔充值活动
2022-01-05 15:38:02 +08:00
luyao 0a9fcbde7c 【天蚀虎】头像 敬请期待图 2021-12-24 14:16:19 +08:00
ZhangBiao 70f5308d1d 【命格】宝石资源提交 2021-12-10 15:05:18 +08:00
luyao ed655ea6a7 【优化】
白素贞小头像、半身像
炼丹师半身像
朝向左>右
2021-12-01 09:20:55 +08:00
luyao 75cd2cf3a3 九命猫、逍遥客小头像翻转方向 左>右 2021-11-30 10:28:16 +08:00
luyao c7ee28efc7 【神将朝向】逍遥客 左>右 2021-11-29 10:00:10 +08:00
luyao f68f821c03 【朝向调整】九命猫t3牌 左>右 2021-11-29 09:48:20 +08:00
luyao e4f02f3c7c 【神将头像t1左>右】【神将缩微图t3 部分左>右】 2021-11-27 16:16:01 +08:00
gaoxin ee5b4a79a8 【资源】图片大小优化 2021-11-27 15:16:57 +08:00
luyao d6678a0246 【资源】卡牌左->右 2021-11-27 15:03:54 +08:00
gaoxin 02114f269f 【资源】神魂功能开启资源位置修改 2021-11-12 15:00:16 +08:00
liujiaqi ccab15ab98 【资源】神魂icon 2021-11-07 14:55:20 +08:00
gaoxin 0defc12b5a 【资源】头像卡牌资源优化 2021-11-01 16:46:30 +08:00
liujiaqi 0438e7db6b 【资源】敖丙皮肤 2021-11-08 16:41:39 +08:00
gaoxin 947002e03a 【新增资源优化】 2021-10-29 17:44:46 +08:00
liujiaqi de56545be4 【资源】九尾狐四不像图标资源 2021-11-09 23:15:38 +08:00
ZhangBiao 26b5a670f9 【界面优化】背包装备优化 2021-10-26 14:04:02 +08:00
liujiaqi 59c1629b18 【资源】四不像icon 2021-11-07 17:32:11 +08:00
ZhangBiao a16b8c5e75 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 2021-10-15 14:06:35 +08:00
lihaiyang 5fbc4458c4 bat Resource Commit:2021/10/14,18:40:50 2021-10-14 18:40:50 +08:00
ZhangBiao 110a6d64c0 【御剑行】导入资源,剑 2021-10-09 18:17:59 +08:00
gaoxin 5ae29d86cd 【织女】法宝资源名修改 2021-09-27 13:48:09 +08:00
gaoxin 5f3768e831 【新资源meta文件上传】 2021-09-24 15:00:44 +08:00
liujiaqi f89e16792e 【资源】女儿国王大小头像 2021-09-24 14:53:34 +08:00
liujiaqi 0b91f698c8 【资源】麒麟卡 2021-09-24 12:41:05 +08:00
liujiaqi 8531ab1c2e 【资源】坐骑icon 2021-09-24 12:40:57 +08:00
gaoxin 7462f02cfd Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +08:00
luyao 150f6e0909 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:51:49 2021-09-08 13:51:49 +08:00
luyao 9b71c0e53e bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:45:19 2021-09-08 13:45:19 +08:00
luyao 681d0be397 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:44:18 2021-09-08 13:44:18 +08:00
luyao 2972a973c5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-07 19:00:24 +08:00
luyao 67326aa278 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/07,19:00:05 2021-09-07 19:00:05 +08:00
luyao 19551d50f9 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/07,18:46:08 2021-09-07 18:46:09 +08:00
gaoxin dec3a4d338 【资源】织女新立绘添加 2021-08-31 18:34:16 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
ZhangBiao aae540d144 【寻宝迷踪】提交 2021-08-09 14:18:31 +08:00
liujiaqi 1952492eba 【资源】玉珏碎片icon 2021-08-05 15:40:36 +08:00
jiaoyangna 0480506f53 【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
2021-07-29 18:36:30 +08:00
liujiaqi dab4dc03fb 【资源】误删资源回滚 2021-07-28 11:10:14 +08:00
wangzhenxing 02cea65055 [称号]====跨服称号资源提交 2021-07-23 11:20:05 +08:00
liujiaqi 57fade3e9d 罗浮争锋称号 2021-07-28 10:31:29 +08:00
luyao 8aeb433618 玲珑宝镜道具图标 ——镜纹秘钥 2021-07-16 16:44:02 +08:00
gaoxin 01e033ad00 【资源】玉皇大帝皮肤资源 2021-06-21 15:14:02 +08:00
JieLing 530374e00b 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
gaoxin 0f47dae77e 【资源】物品资源修改 2021-06-03 15:07:45 +08:00
gaoxin 865051dfb1 【资源】法宝资源优化 2021-06-02 21:46:12 +08:00
gaoxin f8c2b74f0e 【资源】新增一些icon 2021-06-02 19:57:40 +08:00
gaoxin 2c7b62e2e4 【资源】物品资源导入 2021-06-01 16:30:17 +08:00
gaoxin 8b35b8ccf7 【踏碎凌霄】称号icon上传 2021-05-31 17:32:18 +08:00
gaoxin cf287eabda 【资源】重复资源删除 2021-05-27 22:12:08 +08:00
jiaoyangna 9ef020d022 重复资源修改提交 2021-05-27 20:49:35 +08:00
gaoxin 0ca658e6a4 【资源】新增法宝,物品资源 2021-05-27 17:16:30 +08:00
zhangqiang b728d3a396 【t3资源漏提】 2021-05-24 17:01:04 +08:00
zhangqiang 29622ac19a 【英雄小头像替换】 2021-05-22 17:58:47 +08:00
wangzhenxing 1478142476 称号资源替换提交 2021-05-22 15:02:09 +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
gaoxin 1c6789c0cf 【资源】新增英雄头像资源 2021-05-18 18:01:08 +08:00
gaoxin 6b9cfdd6c2 【资源】新增物品资源 2021-05-14 15:54:28 +08:00
gaoxin 4ea075e0e5 【资源】玉帝资源名修改 2021-04-27 23:42:13 +08:00
gaoxin 059535bbc0 【资源】新增法宝资源,玄黄之气资源替换,玉帝技能文字替换 2021-04-27 22:40:20 +08:00
gaoxin c73f7b4fbc 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00