Commit Graph

443 Commits (4ad01a20d688d6a0868589195bd41d943901dfab)

Author SHA1 Message Date
wangzhenxing 4d60ba6825 鸿蒙替换图片资源 2024-01-20 14:53:17 +08:00
xiejun c737471a4a 宝库UI修改 2024-01-19 11:17:30 +08:00
PC-202302260912\Administrator 6d160c20f1 活动图片 2024-01-18 21:27:56 +08:00
wangzhenxing 06ae3f63f7 奥义卡修改 2024-01-18 20:10:08 +08:00
wangzhenxing 182c750e62 Revert "奥义卡背景图修改"
This reverts commit f58d60b251.
2024-01-18 19:09:10 +08:00
wangzhenxing f58d60b251 奥义卡背景图修改 2024-01-18 19:08:03 +08:00
xiejun cc654d81d0 寻仙UI替换 2024-01-17 18:24:51 +08:00
xiejun cd858da64f 公会试炼 2024-01-17 15:57:29 +08:00
wangzhenxing 4f23b260da 背包神石分解界面 2024-01-17 15:48:24 +08:00
wangzhenxing 03c715e878 删除无用资源 2024-01-17 14:22:32 +08:00
wangzhenxing 9a45b6e831 删除老图片资源 2024-01-17 10:56:01 +08:00
xiejun 4a78e2d711 图片 2024-01-16 18:59:32 +08:00
xiejun e0877fe790 meta文件 2024-01-16 18:57:49 +08:00
xiejun b3f0022089 牛气冲天 2024-01-15 18:27:10 +08:00
xiejun 2f3676cba0 资源 2024-01-15 15:39:58 +08:00
xiejun 92b7a457f9 修改特权的底图 2024-01-13 17:53:47 +08:00
wangzhenxing 1f59af9b48 潜能界面修改 2024-01-12 15:58:26 +08:00
xiejun 2951442c84 挖宝 2024-01-10 18:43:49 +08:00
xiejun c6b189c443 修改武器室品质色底图 2024-01-09 19:01:36 +08:00
PC-202302260912\Administrator 73f0f66d5f 图片添加 2024-01-08 18:14:09 +08:00
PC-202302260912\Administrator 9cb1f22008 灵兽和名刀图片 2024-01-08 18:11:27 +08:00
PC-202302260912\Administrator 88565ebc09 装备背景图 2024-01-08 17:56:33 +08:00
xiejun 9f8a65e453 核心标记 2024-01-05 18:14:42 +08:00
xiejun 027eb9d1c5 图片资源 2024-01-05 14:33:46 +08:00
xiejun cee660230b 修改bug 2024-01-04 17:07:44 +08:00
xiejun 35cb160031 背景图 2023-12-29 20:54:48 +08:00
xiejun 2414e3135d 生命卡抽卡BG 2023-12-28 21:06:04 +08:00
xiejun 4f8f3955ce 关卡动态页面和巅峰赛竞技场 2023-12-22 15:36:03 +08:00
xiejun 04dcb81b8a 修改四海副本的UI 2023-12-11 16:14:28 +08:00
wangzhenxing 88855d8ca3 角色信息修改提交 2023-12-08 21:12:17 +08:00
PC-202302260912\Administrator f9297f4101 修改神兵相关 2023-12-06 17:17:34 +08:00
wangzhenxing 80df51683c 名刀技能描述修改 称号修改 2023-12-06 16:58:51 +08:00
xiejun dcb7770e8d 神兵UI修改 2023-12-06 15:49:03 +08:00
wangzhenxing 954b807de7 挂机界面修改 2023-12-05 18:46:19 +08:00
xiejun e4c19a14ca 图标 2023-12-05 18:16:47 +08:00
PC-202302260912\Administrator 19633d5ba9 图标上传 2023-12-05 17:42:14 +08:00
PC-202302260912\Administrator ae9a22e08d 头像按钮上传 2023-12-05 16:19:08 +08:00
wangzhenxing 7530b29510 引导界面修改提交 2023-12-04 16:35:58 +08:00
PC-202302260912\Administrator 42da5fd35f 上传一些图片 2023-12-04 15:24:57 +08:00
xiejun b7b5ad6c72 起名的ui替换 2023-12-01 17:41:01 +08:00
xiejun 90b4946916 图片 2023-11-30 14:06:01 +08:00
xiejun bacab5b38b 特训修改 2023-11-29 17:00:29 +08:00
xiejun 4e6e0f29bd 角色特训 2023-11-28 21:31:01 +08:00
wangzhenxing 87734b56ee 特训提交 2023-11-22 18:38:49 +08:00
wangzhenxing 8e8c6f3ad6 删除效果图 2023-11-15 19:01:47 +08:00
wangzhenxing 344e68ff63 预设修改提交 2023-11-15 14:25:44 +08:00
wangzhenxing 5a7f33307e 删除效果图 2023-11-14 19:02:30 +08:00
wangzhenxing 4e04803971 多对塔修改 2023-11-14 18:34:01 +08:00
xiejun 7d4c58f026 修行界面 2023-11-13 18:05:45 +08:00
xiejun f49e326c83 战斗的胜败,首领信息,最佳mvp等界面 2023-11-12 16:24:40 +08:00
wangzhenxing 1642a786a9 挂机金币按钮提交 2023-11-10 18:53:24 +08:00
wangzhenxing 430b10a5d0 排行榜,背包界面修改提交 2023-11-10 16:13:26 +08:00
wangzhenxing 62d0af98c2 挂机界面提交 2023-11-10 11:48:41 +08:00
PC-202302260912\Administrator 7b869484dc 魂印修改 2023-11-09 17:34:52 +08:00
PC-202302260912\Administrator a0927452ca 临时图片上传 2023-11-09 15:36:54 +08:00
wangzhenxing 31718ea87d 主界面修改升级界面修改 2023-11-09 15:35:38 +08:00
PC-202302260912\Administrator 3c5fde5a4d 周卡相关东西 2023-11-09 11:09:19 +08:00
wangzhenxing af424d57cf loading7修改 2023-11-09 10:59:25 +08:00
wangzhenxing b00f874236 点石成金修改提交 2023-11-09 10:52:24 +08:00
PC-202302260912\Administrator ff7b956505 loading相关 2023-11-08 19:10:09 +08:00
wangzhenxing 8223d041f9 聊天界面修改 2023-11-08 15:52:49 +08:00
wangzhenxing 8da4412a87 主城预设 修改提交 2023-11-08 13:55:38 +08:00
PC-202302260912\Administrator 5f14e298b7 踏碎凌霄 2023-11-08 11:27:11 +08:00
PC-202302260912\Administrator d437ad593f 变身卡升星页面修改 2023-11-07 20:23:52 +08:00
wangzhenxing f335977a4b 装备详情界面修改 2023-11-07 15:56:30 +08:00
PC-202302260912\Administrator 98fe20b8da 服务器选择页面 2023-11-06 19:46:18 +08:00
wangzhenxing f25e213b73 命石界面修改 2023-11-06 16:58:35 +08:00
PC-202302260912\Administrator 92697e036c 通用页面上传 2023-11-06 15:21:57 +08:00
PC-202302260912\Administrator 7bb9276a39 优化抽卡页面 2023-11-03 19:19:38 +08:00
xiejun 9b27835185 抽卡 2023-11-03 16:45:33 +08:00
wangzhenxing 0d2638355a 主界面修改 2023-11-03 15:46:07 +08:00
wangzhenxing 90134677d2 急速探索界面修改提交 2023-11-03 11:42:57 +08:00
PC-202302260912\Administrator 3f6e823337 通用图标上传 2023-11-03 10:52:32 +08:00
PC-202302260912\Administrator e3e24353ef 神将 2023-11-02 19:22:51 +08:00
wangzhenxing 0167d707bf 首充修改提交 2023-11-02 17:46:09 +08:00
xiejun a45b0fbb23 点将台UI 2023-11-02 17:24:35 +08:00
PC-202302260912\Administrator 192e92416e 在线奖励相关 2023-11-02 16:58:30 +08:00
wangzhenxing c67eb7f7ad 神兵系统界面修改提交 2023-11-02 16:03:11 +08:00
PC-202302260912\Administrator 7c0cf86935 首充相关 2023-11-01 19:08:54 +08:00
wangzhenxing 9a86ec8026 神兵主界面修改提交 2023-11-01 19:02:00 +08:00
PC-202302260912\Administrator a87bca727c 限时折扣 2023-11-01 17:29:04 +08:00
PC-202302260912\Administrator fc66533d1a 阵营推荐 2023-11-01 16:27:05 +08:00
wangzhenxing 730966a6df Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-01 15:47:46 +08:00
wangzhenxing dbac53d14d 属性信息界面,技能信息界面修改 2023-11-01 15:47:17 +08:00
xiejun f939ff8ac8 神将置换UI 2023-11-01 15:46:54 +08:00
PC-202302260912\Administrator 121a97c801 添加按钮 2023-11-01 15:24:32 +08:00
wangzhenxing 08fea279e1 化身卡修改提交 2023-11-01 15:11:41 +08:00
PC-202302260912\Administrator d4779c6a3d 超级特权相关 2023-11-01 14:39:15 +08:00
PC-202302260912\Administrator aa81773fb0 主界面图标 2023-11-01 10:47:24 +08:00
PC-202302260912\Administrator 442e99da6d 限时兑换 2023-10-31 18:55:40 +08:00
PC-202302260912\Administrator 90eab3e98d 7日登陆 2023-10-31 17:00:08 +08:00
wangzhenxing ad48afbfe9 礼物界面修改提交 2023-10-31 16:23:50 +08:00
xiejun 1e53fbc529 锻器阁 2023-10-31 15:30:06 +08:00
wangzhenxing 9d6308c909 法宝聚灵界面修改提交 2023-10-31 14:38:02 +08:00
PC-202302260912\Administrator b15c4f942e 礼物相关 2023-10-31 11:43:32 +08:00
PC-202302260912\Administrator c11ad012de 四象心法优化 2023-10-30 20:28:39 +08:00
wangzhenxing d1a9cff2c5 法宝聚灵修改提交 2023-10-30 19:16:17 +08:00
PC-202302260912\Administrator 7088098c1a 四象心法修改 2023-10-30 16:29:58 +08:00
PC-202302260912\Administrator 21d8e1ee5b 添加日常任务缺少的图片 2023-10-28 16:08:31 +08:00
PC-202302260912\Administrator aeb72a1f7b 天宫寻宝 2023-10-28 15:41:04 +08:00
xiejun 44e3f87d2c 背包资源 2023-10-27 18:50:54 +08:00
xiejun 1c56d6629d 修改公会,和恭喜获得的UI 2023-10-27 17:39:09 +08:00
xiejun 8ef7efa6c1 达人活动UI和神印BUG 2023-10-27 16:41:28 +08:00
wangzhenxing ed4865cc3c 法宝星级显示修改 2023-10-26 20:44:18 +08:00
xiejun fafab89f48 升星冲榜UI 2023-10-26 18:44:37 +08:00
xiejun d9d842c5be 恭喜获得 2023-10-26 14:54:18 +08:00
xiejun 965fc5d494 十绝症UI 2023-10-25 18:51:09 +08:00
PC-202302260912\Administrator fe702e50c4 天宫寻宝 2023-10-25 16:06:27 +08:00
xiejun 663fbca133 神兵热榜 2023-10-24 20:02:38 +08:00
xiejun e1d0445714 修改bug,删除部分老预设 2023-10-23 17:44:09 +08:00
xiejun 443dbba568 充值UI修改 2023-10-20 18:51:12 +08:00
PC-202302260912\Administrator 98168f92a1 成就相关 2023-10-20 17:18:23 +08:00
PC-202302260912\Administrator b487194cd8 上传信息图片 2023-10-20 15:18:31 +08:00
PC-202302260912\Administrator 99d70ca52d 月卡换底 2023-10-20 13:24:17 +08:00
xiejun d7762a4a00 登录界面替换UI 2023-10-19 22:51:00 +08:00
PC-202302260912\Administrator 34ba7a787d 月卡相关 2023-10-19 22:43:48 +08:00
xiejun 2212a7443d 邮件和邮件内容UI 2023-10-19 21:05:35 +08:00
xiejun bfbce921a3 屏蔽修行按钮,更换日常任务的UI,修改了好友的按钮选择显示逻辑 2023-10-19 17:42:21 +08:00
xiejun 077b82bd84 好友,公会副本等UI修改 2023-10-18 20:41:04 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
xiejun eb926fc087 灵兽 2023-09-28 17:05:40 +08:00
xiejun 88740201b3 排行榜UI 2023-09-20 18:00:40 +08:00
xiejun af6b341a0c 修改子弹逻辑 2023-09-18 15:41:32 +08:00
xiejun 3ab79a59b7 副本UI 2023-09-02 18:53:21 +08:00
xiejun 1a34fec66e 修复bug 2023-09-01 20:18:46 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
xiejun 4d8b08104c 七界资源 2023-08-28 18:52:15 +08:00
xiejun f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
xiejun 58f205f22b 新图标 2023-08-15 17:03:19 +08:00
xiejun bbde945918 新角色立绘 2023-08-15 12:36:04 +08:00
xiejun 19231ba20a 公会UI 2023-08-14 16:36:26 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
xiejun 214151b5ca 修改 2023-07-04 10:28:57 +08:00
xiejun ab6a726b3a 增加凯多角色 2023-07-02 21:52:32 +08:00
xiejun b47c16dcb7 test 2023-06-20 18:01:51 +08:00
lihaiyang f595ebee5b 修改称号等美术图标 2023-06-02 13:18:06 +08:00
yuanshuai a18efd9a1f 挂机战斗优化 2022-11-24 19:00:24 +08:00
yuanshuai 5005e8da5f 挂机战斗修改 2022-11-24 18:28:48 +08:00
wangzhenxing 5ae17748ce 月卡图片修改 2022-11-16 16:10:23 +08:00
lihaiyang 8779ae8ef0 【周卡】==修正图片 2022-11-02 14:53:10 +08:00
lihaiyang 48a0538cac 【月卡】==替换月卡图标 2022-11-02 13:43:20 +08:00
lihaiyang c6527aa0e1 【loading图】===========loading图上传 2022-11-02 14:30:33 +08:00
lihaiyang e8d38b2bdb 修改两个月卡图标 2022-10-12 15:56:53 +08:00
yuanshuai b74a00e7df 界面调整 2022-06-10 16:37:56 +08:00
luyao e6ba8c5d05 周卡【再领一次】图片资源 2022-06-10 14:12:18 +08:00
yuanshuai 783298b7b2 周卡再领一次资源提交 2022-06-10 13:15:27 +08:00
yuanshuai 2d18090df7 周卡月卡脚本预设提交 2022-06-09 14:19:07 +08:00
yuanshuai dd13ed98bd 终身卡资源修改 2022-06-01 11:12:07 +08:00
yuanshuai 3a5466546e 图片提交 2022-05-19 11:00:36 +08:00
yuanshuai c9dfe177e6 百抽派送活动提交 2022-05-17 13:23:15 +08:00
yuanshuai c5b0d30f9c 资源提交 2022-04-19 13:39:48 +08:00
gaoxin 2342bd8af8 【拍脸】寻仙招募拍脸添加 2022-02-23 18:08:50 +08:00
ZhangBiao 48901f3817 【寻仙招募】心愿单中添加飞升石道具 2022-01-12 18:27:16 +08:00
jiaoyangna 29a3faa8c0 切图提交 2021-12-28 15:36:04 +08:00
ZhangBiao 0d3f9c36ad 【灵脉秘境】背景图 2021-11-24 18:43:59 +08:00
ZhangBiao c8d4cadb2b 【灵脉秘境】提交 2021-11-19 15:38:41 +08:00
gaoxin 0fcf94a9c8 【周卡】协议,界面,逻辑搭建完成 2021-10-29 09:42:33 +08:00
gaoxin a712ddee3b 【挚礼月卡】功能完善 2021-10-20 16:36:36 +08:00
gaoxin 85b15d6cb7 Merge branch 'china/dev' into 0活动开发聚集地/挚礼月卡 2021-10-20 15:14:38 +08:00
gaoxin 761f8d660c 【挚礼月卡】资源上传 2021-10-18 15:16:24 +08:00
ZhangBiao 99d80454f5 【御剑行】增加开始动画 2021-10-11 17:25:48 +08:00
ZhangBiao a565d94658 【御剑行】资源提交 2021-09-26 17:39:49 +08:00
ZhangBiao 1c191a78b9 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
2021-09-22 11:46:24 +08:00
gaoxin 7462f02cfd Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +08:00
ZhangBiao 6078ae545a 【七界试炼】提交 2021-09-06 17:21:53 +08:00
jiaoyangna 56af6f1a11 第一次bug修改提交 2021-08-31 20:22:59 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
ZhangBiao 87cf2102fe 【寻宝迷踪】添加资源 2021-08-04 18:16:36 +08:00
gaoxin 8eb63b7692 【资源】我要变强背景资源回滚 2021-08-04 15:46:41 +08:00
gaoxin d36ab6421a 【资源】挂机地图误删资源恢复 2021-08-04 09:51:44 +08:00
zhangqiang d731f30dec 【巅峰赛】背景 2021-07-30 17:57:43 +08:00
jiaoyangna 0480506f53 【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
2021-07-29 18:36:30 +08:00
liujiaqi dab4dc03fb 【资源】误删资源回滚 2021-07-28 11:10:14 +08:00
jiaoyangna b98fd71d35 删除资源工具提交 2021-07-28 17:00:14 +08:00
jiaoyangna b75d869c8a 【资源优化】整理废弃的冗余资源,减少包体大小 2021-07-27 17:13:18 +08:00
jiaoyangna 9a4c92baa1 Revert "【ID1009762】"
This reverts commit c99394b54e.
2021-07-27 17:04:12 +08:00
jiaoyangna c99394b54e 【ID1009762】
【资源优化】整理废弃的冗余资源,减少包体大小
2021-07-27 15:24:11 +08:00
ZhangBiao a711f13642 【新副本】资源重新提交 2021-07-07 13:50:11 +08:00
ZhangBiao 6a3c7903f5 【新副本】资源提交 2021-07-06 18:32:23 +08:00
gaoxin 9c58070aa8 Merge branch 'china/dev-c' into china/dev
# Conflicts:
#	Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
#	Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta
#	Assets/ManagedResources/DynamicAtlas/s_suoxiangpimi_banner_zh.png.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua
#	Assets/Scripts/Editor/GameEditor/FrameTool/ConfigWindow.cs
2021-07-06 15:27:09 +08:00
zhangqiang fbda34d678 Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-07-03 16:53:42 +08:00
zhangqiang 2f269ebfa8 【缥缈之旅】提交2 2021-07-03 12:37:56 +08:00
ZhangBiao a37fd67704 【特惠神装】基本完成 2021-07-01 19:56:28 +08:00
ZhangBiao 097cf4055f 【灵兽界面优化】优化界面效果 2021-06-24 14:47:54 +08:00
gaoxin 4bde4b31ad 【资源】新增无尽副本地图资源 2021-06-22 11:00:37 +08:00
JieLing 530374e00b 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
zhangqiang d91c57f6ea 【心魔试炼】 2021-06-09 19:48:28 +08:00
gaoxin 9a164336fa 【资源】战斗背景替换,主界面删除转盘 2021-06-09 14:52:00 +08:00
gaoxin 1a14550cd7 【添加无损压缩的文件夹】 2021-06-04 20:31:58 +08:00
gaoxin 791233463b 【登录】更换登录图 2021-06-04 18:09:40 +08:00
gaoxin 0def3449c3 【配置】loading界面背景实现配置 2021-05-31 19:19:57 +08:00
gaoxin 6b0ff9668d 【配置】包配置添加 2021-05-31 17:31:31 +08:00
ZhangBiao e615af9011 【福星高照】bug修改 2021-05-27 14:09:39 +08:00
gaoxin f9b93995f7 【资源】侵权替换 2021-05-27 11:32:12 +08:00
gaoxin 653d9bbd06 【meta】 2021-05-26 13:43:11 +08:00
jiaoyangna 5ceb07ca7d 删除图片提交 2021-05-25 10:30:32 +08:00