Commit Graph

1086 Commits (e0877fe790b6ab0857a4c2c6597e9b30e6898567)

Author SHA1 Message Date
wangzhenxing 0607e5179c 图片替换 2022-12-16 17:25:05 +08:00
lihaiyang a7a7c3eb42 【10万真充】===修改图标 2022-12-20 18:16:27 +08:00
wangzhenxing 7109e86706 英雄热榜提交 2022-12-13 16:06:12 +08:00
wangzhenxing 4680624d43 日常副本预设修改 2022-12-06 13:44:29 +08:00
wangzhenxing 611af0d444 日常副本修改提交 2022-12-05 14:45:59 +08:00
yuanshuai 0dad2fdb77 超值基金资源修改 2022-12-02 17:45:01 +08:00
wangzhenxing 214b316ac9 [bt]========主城鸿蒙镇修改提交 2022-12-01 14:24:05 +08:00
yuanshuai ba07730c30 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-11-29 17:44:37 +08:00
yuanshuai 61e5646c05 资源修改 2022-11-29 17:44:23 +08:00
wangzhenxing 032ef3d34d [bt]======充值修改 2022-11-29 17:42:48 +08:00
yuanshuai 1ebe336d52 阵容推荐修改 2022-11-29 17:11:21 +08:00
wangzhenxing 5c49a471da [gm]====送10万充提交 2022-11-28 18:40:45 +08:00
yuanshuai 5005e8da5f 挂机战斗修改 2022-11-24 18:28:48 +08:00
wangzhenxing dce08e4ce8 仙充券图标提交 2022-11-23 15:50:09 +08:00
wangzhenxing 86bfbe1496 刷冲特权预设修改 2022-11-23 15:45:31 +08:00
yuanshuai 41d594edbc 挑战副本修改优化 2022-11-17 10:48:24 +08:00
lihaiyang f3935cc3ca 【转盘】=======修改名字 2022-11-02 17:29:45 +08:00
wangzhenxing 8d26aa7456 月卡图标修改 2022-11-16 15:40:29 +08:00
wangzhenxing f285d5e797 寻仙招募图标修改提交 2022-11-16 14:06:55 +08:00
lihaiyang a6929bab54 【防御挑战】======防御挑战图标上传 2022-11-14 17:46:04 +08:00
wangzhenxing 3b88556b82 gm按钮修改 2022-11-10 11:09:10 +08:00
wangzhenxing 119c186c34 [主城]=======按钮修改提交 2022-11-08 14:51:51 +08:00
lihaiyang 95de278038 【图标更换】==探索特权更改为太初 2022-11-02 14:27:47 +08:00
lihaiyang 2c3da19544 【豪华补给】=======修正图标 2022-11-03 07:06:40 +08:00
lihaiyang 9cdf8e9861 召唤图标 2022-11-02 16:28:41 +08:00
wangzhenxing 6c8c6182ad 特权商城入口图标修改 2022-11-02 13:44:46 +08:00
wangzhenxing eacc6ef2f5 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-10-31 18:14:35 +08:00
wangzhenxing 1e62991c2c [gm]=====开服冲榜提交 2022-10-31 18:13:41 +08:00
lihaiyang a688cd5ffe 魂印冲榜称号 2022-10-31 16:51:37 +08:00
lihaiyang dcb2321134 【称号】=============开服冲榜称号上传 2022-10-21 17:04:15 +08:00
wangzhenxing 9faaa0cd5d [gm]======冲榜图片提交 2022-10-28 19:06:31 +08:00
wangzhenxing ac078416dd [gm]======转盘提交 2022-10-27 15:32:13 +08:00
wangzhenxing 5fbc31d8e8 [gm]======免费充值界面修改 2022-10-25 13:51:43 +08:00
lihaiyang fa6df99528 【名望】===背景添加九宫格 2022-10-24 15:29:37 +08:00
lihaiyang 8ac9c82ca2 【名望】===等级图标 2022-10-24 11:32:14 +08:00
lihaiyang 39dd11c6e8 【名望】====修正标题 2022-10-24 11:26:40 +08:00
lihaiyang 3d9fb70f74 【名望】============添加名望底框 2022-10-24 11:05:29 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
wangzhenxing b0532edcca [gm]======图片资源提交 2022-10-14 17:28:39 +08:00
wangzhenxing efe732d91d [gm]=============刷冲特权提交 2022-09-23 15:24:10 +08:00
lihaiyang dbe58e993e [gm]=======称号提交 2022-09-22 11:45:28 +08:00
wangzhenxing a8f46604c9 [gm]======创角即送提交 2022-09-21 16:08:59 +08:00
wangzhenxing fdaec2ac28 [gm修改器]=====提交 2022-09-20 17:04:48 +08:00
lihaiyang f50028cef7 [无限资源阁]========界面修改提交 2022-09-01 18:22:04 +08:00
wangzhenxing ff824e3f3a [全民福利]=====预设修改提交 2022-09-14 13:33:22 +08:00
yuanshuai 7447eab324 神尊特权预设修改 2022-09-13 16:50:56 +08:00
yuanshuai 23416c35cf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-09-09 18:09:59 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
wangzhenxing b6b1f53d64 [bt]=====无限资源阁提交 2022-09-09 16:45:58 +08:00
yuanshuai 552ea8ec0e 建木神树icon修改 2022-09-06 18:29:30 +08:00
wangzhenxing 872aabfa5d 提交文件夹 2022-08-19 10:29:16 +08:00
wangzhenxing bf31576d31 [森罗幻境]====一键扫荡按钮限时隐藏 2022-08-18 11:27:36 +08:00
wangzhenxing 4d59e2b852 [背包]====装备碎片显示修改 2022-08-16 16:36:09 +08:00
wangzhenxing c08410abc6 商店添加法宝提示 2022-08-10 16:28:54 +08:00
luyao f22058cbe2 化身之力界面的顶光、衬底图 2022-07-22 17:48:10 +08:00
luyao 3d412c94af 化身之力界面素材(身外化身,与小标题衬底图) 2022-07-22 17:32:20 +08:00
luyao 1f1344deff 神灵试炼 功能预告图标 2022-07-21 15:18:52 +08:00
yuanshuai e05cdfc388 数字游戏资源修改 2022-07-18 16:16:28 +08:00
wangzhenxing 0ad32a203f 【首充】=======图片修改 2022-07-13 14:35:59 +08:00
wangzhenxing b888cb42e0 [首充图片修改提交]======== 2022-07-13 10:56:57 +08:00
wangzhenxing 5535d7df71 [首充]=====首充修改 2022-07-12 18:25:50 +08:00
yuanshuai d952b9a44c 数字游戏模块提交 2022-07-11 15:43:04 +08:00
wangzhenxing 8b96deb37c [首充]=======首充背景图修改 2022-07-01 16:02:34 +08:00
wangzhenxing d796a106bc [超值连冲]========活动修改红点修改 2022-06-17 16:00:48 +08:00
luyao b0800267d6 惊喜礼盒 装饰台 文件替换【棕色》》》黄色】 2022-06-15 15:02:08 +08:00
wangzhenxing 547a56b2a9 [首充]======首充修改 2022-06-08 15:35:52 +08:00
wangzhenxing d6992ae3a9 [首充]======入口图标修改提交 2022-06-07 16:55:35 +08:00
wangzhenxing 0086c01ff6 [首充]======首充修改提交 2022-06-07 15:48:54 +08:00
yuanshuai d65caf0822 终身卡图片资源修改 2022-06-01 16:26:40 +08:00
luyao 0e193d22be 删除无用图标 2022-06-01 16:13:39 +08:00
luyao 98faae275c 终身卡图标(暗状态) 2022-06-01 16:06:18 +08:00
luyao bb28e940e7 测试 终身卡图标 2022-06-01 15:45:28 +08:00
wangzhenxing dd7a256469 [周卡]======红点修改提交 2022-06-01 14:50:08 +08:00
yuanshuai dd13ed98bd 终身卡资源修改 2022-06-01 11:12:07 +08:00
wangzhenxing 6925105782 [周卡]======周卡提交 2022-06-01 09:34:41 +08:00
wangzhenxing e7df09c284 [寻仙招募]======修改提交 2022-05-23 11:29:10 +08:00
wangzhenxing 7557858517 [资源]========寻仙商店图标修改提交 2022-05-20 14:46:38 +08:00
wangzhenxing 2b75be487d 天赋按钮位置图片修改 2022-05-19 22:37:52 +08:00
wangzhenxing 3b4e771d16 [神将信息展示]======神将信息修改 2022-05-19 16:38:52 +08:00
yuanshuai 3a5466546e 图片提交 2022-05-19 11:00:36 +08:00
yuanshuai 9c9018b1da 终身卡功能提交 2022-05-18 19:39:19 +08:00
yuanshuai c9dfe177e6 百抽派送活动提交 2022-05-17 13:23:15 +08:00
yuanshuai 4b6c27d10d 炼气期资源提交 2022-04-29 12:31:51 +08:00
luyao 1a84c8e5ad 神印商店店名图标上传 2022-04-25 10:55:19 +08:00
luyao f82f6cbbd9 神印、挑战副本预告图标 2022-04-24 19:01:36 +08:00
wangzhenxing e498661919 神印添加背包分解 2022-04-24 16:36:27 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
luyao 6238708fee 探索商店,挑战商店 文字上传 2022-04-22 17:37:45 +08:00
luyao 4cee830a53 新图标、UI资源、meta文件上传 2022-04-22 16:29:09 +08:00
luyao f620d95f5e 【tips背板】修改提交 2022-04-22 15:49:52 +08:00
luyao 3526f91c3e 数字(0、100)中文字上传 2022-04-22 14:53:16 +08:00
luyao 582035b920 新排行榜资源(滑动条2个,标题衬底,分割线,排名衬底,奖励分割线) 2022-04-22 11:05:25 +08:00
luyao a307674de8 新按钮 已完成状态 2022-04-21 18:32:25 +08:00
luyao 8fe5b43449 新 按钮(前往、可领取、已完成) 2022-04-21 18:21:08 +08:00
luyao cb3576eb58 新底板拆分 2022-04-21 14:27:03 +08:00
luyao 023ba719d4 tips弹窗资源 2022-04-21 14:14:19 +08:00
wangzhenxing 9999138d97 [资源]=======新提示背景框提交 2022-04-21 13:41:59 +08:00
luyao 7ef0eac7f1 变身卡 【变】字角标(规格同阵营元素图标) 2022-04-21 11:22:12 +08:00
luyao 47e8205e8a 回合挑战、伤害挑战 标题
挑战副本标题
2022-04-21 11:18:03 +08:00
luyao d99e434172 2022年新图标(魂印、法宝、神印、装备) 2022-04-21 11:13:29 +08:00
luyao 15672af59a 回合挑战、伤害挑战图标(各2个,选中,未选中状态) 2022-04-21 11:11:54 +08:00
yuanshuai bf52645eb7 挑战副本优化 2022-04-25 18:20:53 +08:00
yuanshuai c5b0d30f9c 资源提交 2022-04-19 13:39:48 +08:00
gaoxin 81f76cc4dc 【限时折扣】主界面按钮资源修改添加特效 2022-03-15 13:37:13 +08:00
wangzhenxing 4ed698b567 [资源]======buff图片提交 2022-03-14 16:07:35 +08:00
jiaoyangna fd0ee200ac 【ID1011218】
天书秘卷功能图标位置调整
2022-03-10 16:15:07 +08:00
jiaoyangna 1c0ce769c3 山河试炼页签修改提交 2022-03-03 10:34:19 +08:00
jiaoyangna 3b0871ad17 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-02 18:08:56 +08:00
jiaoyangna 6b4cf31c3c 【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
2022-03-02 17:48:52 +08:00
张彪 e4e23c8ac7 【易经宝库】改页签名字 2022-03-02 17:33:08 +08:00
jiaoyangna d0720e17b2 【ID1011178】
至尊降世活动拉到1000档
2022-02-23 17:24:34 +08:00
张彪 6044ee2828 【战力冲刺】图标提交 2022-02-18 18:11:18 +08:00
张彪 4ca27d13ad 【战力冲刺】提交 2022-02-18 16:27:49 +08:00
jiaoyangna 22f070e13b 资源提交 2022-02-16 14:28:08 +08:00
gaoxin 67c855ad56 【资源】特惠商城资源替换 2022-02-23 18:36:30 +08:00
jiaoyangna 3a9acbdf19 签到好礼提交 2022-01-21 18:49:40 +08:00
wangzhenxing b64234bcb8 [飞升]=====特效修改提交 2022-01-20 18:18:40 +08:00
wangzhenxing e734c4a03d [飞升]=======飞升修改 2022-01-20 11:41:20 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
wangzhenxing 4034a90a33 [飞升]======优化修改提交 2022-01-19 15:29:47 +08:00
ZhangBiao 60df01190d 【家园】资源替换 2022-01-18 15:19:19 +08:00
jiaoyangna ac24c2e0ce 【ID1010998】
【春节活动】签到领奖活动
2022-01-18 14:48:27 +08:00
wangzhenxing 0b3007a9c7 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-15 18:16:56 +08:00
wangzhenxing 2df3e777db [图片]====记录按钮资源修改 2022-01-15 16:38:45 +08:00
wangzhenxing 1ef962d688 【图鉴】====飞升通用图标资源修改 2022-01-15 16:05:54 +08:00
ZhangBiao c373f8d014 【修改】提交 2022-01-15 15:05:26 +08:00
ZhangBiao 756dc54595 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-15 14:35:21 +08:00
ZhangBiao f4c1b9d097 【修改】提交 2022-01-15 14:34:55 +08:00
wangzhenxing e8f8f5ca59 [图鉴]=====图鉴详情修改提交 2022-01-15 14:32:55 +08:00
wangzhenxing ef0a0ff436 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2022-01-15 12:47:22 +08:00
ZhangBiao 9d8586008d 【家园】资源替换 2022-01-14 17:51:56 +08:00
ZhangBiao cbea9006b3 【家园】资源替换 2022-01-14 17:38:46 +08:00
ZhangBiao dddbe9f223 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 17:20:18 +08:00
ZhangBiao 9ec22eee1f 【好感度】引导 2022-01-14 17:20:06 +08:00
jiaoyangna e6791caf3f 图片修改提交 2022-01-14 17:08:41 +08:00
jiaoyangna 3f267894a8 神将修改提交 2022-01-14 16:14:52 +08:00
jiaoyangna 053de388f2 神将修改提交 2022-01-14 14:52:56 +08:00
jiaoyangna 7556405e8b 切图修改 2022-01-14 13:45:12 +08:00
jiaoyangna 5252dbe400 技能添加底图 2022-01-14 13:20:32 +08:00
jiaoyangna 981aba2417 神将情报修改提交 2022-01-14 11:26:13 +08:00
jiaoyangna ed63358ab6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_2000340_xy.png.meta
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_8810_hh.png.meta
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_ysz_7.png.meta
2022-01-14 10:19:54 +08:00
jiaoyangna e4ea506ed1 神将情报修改提交 2022-01-14 10:17:19 +08:00
wangzhenxing 69d1a45883 【战斗】=====反伤盾图片提交 2022-01-13 17:45:31 +08:00
ZhangBiao 48901f3817 【寻仙招募】心愿单中添加飞升石道具 2022-01-12 18:27:16 +08:00
ZhangBiao 60c31c1d5b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 18:20:19 +08:00
ZhangBiao 617a557071 【家园】修改按钮 2022-01-11 18:20:12 +08:00
wangzhenxing 039f9a3deb [图鉴]======图鉴修改提交 2022-01-11 18:11:13 +08:00
jiaoyangna af9306d8cf 未解锁添加未解锁提示 2022-01-11 14:23:24 +08:00
jiaoyangna 6bb00a785c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 11:28:58 +08:00
gaoxin d67f8cd2fa 【云梦豪礼】添加198裆位 2022-01-13 17:34:51 +08:00