Commit Graph

1169 Commits (0211cf2a6074192b8b208e8e34af9d1ea0b3c51e)

Author SHA1 Message Date
PC-202302260912\Administrator eba6b3cacb 删除无用图片 2024-12-02 20:03:05 +08:00
DESKTOP-RH64908\Administrator 351f192b82 1 2024-11-22 20:12:01 +08:00
zhangjiannan 84096616d2 修改挂机奖励按钮 2024-11-13 14:58:05 +08:00
zhangjiannan 417d77c3f6 新增时空导入部分资源以及备份海贼部分资源 2024-11-13 10:31:19 +08:00
zhangjiannan 699c903e8d 删除多余资源 2024-11-13 10:29:52 +08:00
DESKTOP-RH64908\Administrator a384bda644 差异meta上传 2024-11-08 11:13:44 +08:00
zhangjiannan c318a3f870 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
PC-202302260912\Administrator c9f6a06d91 红点图片替换 2024-09-24 14:20:28 +08:00
PC-202302260912\Administrator 1e3c37b32b 更换加号图片 2024-09-24 12:05:56 +08:00
PC-202302260912\Administrator fd3bf20cb5 排行榜图标替换 2024-09-23 18:19:27 +08:00
zhangjiannan 4df7b99e38 meta上传 2024-09-23 14:48:00 +08:00
PC-202302260912\Administrator cc4b2584b6 大剑豪改为宇宙帝王 2024-09-14 15:37:18 +08:00
PC-202302260912\Administrator 52926012d6 名刀变超级武器 2024-09-12 16:12:17 +08:00
DESKTOP-MMO982B\User fac68e88ae Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill/gedoujiaqiqi_skill1.png.meta
2024-09-11 17:12:37 +08:00
PC-202302260912\Administrator 7e7b86d35e 阵营命修改 上传一部分杂乱的mat 2024-09-06 19:30:37 +08:00
PC-202302260912\Administrator 6be4c4c610 龙珠阵营图标修改 2024-09-05 17:20:13 +08:00
wangzhenxing 443b47d5c9 删除多余资源 2024-03-01 14:04:49 +08:00
wangzhenxing 95fbcb444b 界面适配提交 2024-02-27 14:55:14 +08:00
PC-202302260912\Administrator 31d0bf9097 按钮更换 2024-02-23 21:03:45 +08:00
wangzhenxing 31e656624f 去除图片 2024-02-20 18:41:29 +08:00
wangzhenxing e1d776e741 删除不用资源 2024-02-07 16:12:03 +08:00
PC-202302260912\Administrator 1fcc48b861 礼物相关 2024-02-05 17:00:34 +08:00
wangzhenxing b0ba41aad5 太初密卷删除无用资源 2024-02-04 19:06:52 +08:00
wangzhenxing 64b6b47414 删除玉虚论道资源 2024-02-04 13:58:54 +08:00
DESKTOP-MMO982B\User 6c7e3b62f1 称号修改 2024-01-29 23:03:32 +08:00
wangzhenxing bb28910a44 删除无用图片 2024-01-26 11:22:38 +08:00
wangzhenxing b7c7632729 删除无用资源 2024-01-24 19:00:58 +08:00
wangzhenxing 9306240ab5 删除过时图片 2024-01-24 14:49:00 +08:00
wangzhenxing c67c9a9141 删除无用资源 2024-01-24 11:43:20 +08:00
wangzhenxing 0c34397607 删除老版资源 2024-01-24 11:09:27 +08:00
PC-202302260912\Administrator 20d1a4099a 法宝聚灵图片 2024-01-18 16:33:14 +08:00
wangzhenxing 03c715e878 删除无用资源 2024-01-17 14:22:32 +08:00
wangzhenxing 9a45b6e831 删除老图片资源 2024-01-17 10:56:01 +08:00
xiejun e0877fe790 meta文件 2024-01-16 18:57:49 +08:00
xiejun 2f3676cba0 资源 2024-01-15 15:39:58 +08:00
xiejun 92b7a457f9 修改特权的底图 2024-01-13 17:53:47 +08:00
PC-202302260912\Administrator b9726ede41 十绝阵名称修改 2024-01-08 19:09:23 +08:00
xiejun cee660230b 修改bug 2024-01-04 17:07:44 +08:00
wangzhenxing d419d0edb2 删除无用资源 2023-12-08 21:59:02 +08:00
PC-202302260912\Administrator 88c670794e 修改称号相关 2023-12-06 17:07:51 +08:00
PC-202302260912\Administrator c2ea98bc54 称号图片 2023-12-06 15:42:35 +08:00
wangzhenxing 954b807de7 挂机界面修改 2023-12-05 18:46:19 +08:00
wangzhenxing 9d7def32b3 变身卡表现修改 2023-12-05 18:00:32 +08:00
PC-202302260912\Administrator 19633d5ba9 图标上传 2023-12-05 17:42:14 +08:00
PC-202302260912\Administrator fec16cf85e 背景框图片 2023-12-05 16:21:31 +08:00
PC-202302260912\Administrator 42da5fd35f 上传一些图片 2023-12-04 15:24:57 +08:00
wangzhenxing 04fc9b9f3e 山河社稷图突破修改提交 2023-12-04 10:52:10 +08:00
xiejun b7b5ad6c72 起名的ui替换 2023-12-01 17:41:01 +08:00
wangzhenxing b624bc17b5 删除无用资源 2023-11-17 19:03:40 +08:00
wangzhenxing 344e68ff63 预设修改提交 2023-11-15 14:25:44 +08:00
wangzhenxing 3b6da73d69 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-15 10:50:00 +08:00
wangzhenxing be28c41a13 删除无用图片 2023-11-15 10:49:44 +08:00
PC-202302260912\Administrator aedc1e5b31 图标修改 2023-11-14 19:51:26 +08:00
wangzhenxing 87ebb4e83b 删除无用资源 2023-11-14 18:58:36 +08:00
wangzhenxing 4e04803971 多对塔修改 2023-11-14 18:34:01 +08:00
PC-202302260912\Administrator d3b82be19c 法宝聚灵修改 2023-11-13 18:57:41 +08:00
wangzhenxing 52f3600ef6 挂机奖励显示修改 2023-11-10 15:07:17 +08:00
wangzhenxing 62d0af98c2 挂机界面提交 2023-11-10 11:48:41 +08:00
wangzhenxing 31718ea87d 主界面修改升级界面修改 2023-11-09 15:35:38 +08:00
wangzhenxing 8223d041f9 聊天界面修改 2023-11-08 15:52:49 +08:00
wangzhenxing 6c2a9c4a84 主城界面修改 2023-11-07 18:14:22 +08:00
wangzhenxing f335977a4b 装备详情界面修改 2023-11-07 15:56:30 +08:00
wangzhenxing f25e213b73 命石界面修改 2023-11-06 16:58:35 +08:00
wangzhenxing 2f160b4e67 挂机界面修改 2023-11-03 14:21:13 +08:00
wangzhenxing 0167d707bf 首充修改提交 2023-11-02 17:46:09 +08:00
wangzhenxing c67eb7f7ad 神兵系统界面修改提交 2023-11-02 16:03:11 +08:00
wangzhenxing 9a86ec8026 神兵主界面修改提交 2023-11-01 19:02:00 +08:00
PC-202302260912\Administrator fc66533d1a 阵营推荐 2023-11-01 16:27:05 +08:00
wangzhenxing 08fea279e1 化身卡修改提交 2023-11-01 15:11:41 +08:00
wangzhenxing 9d6308c909 法宝聚灵界面修改提交 2023-10-31 14:38:02 +08:00
wangzhenxing d1a9cff2c5 法宝聚灵修改提交 2023-10-30 19:16:17 +08:00
xiejun 44e3f87d2c 背包资源 2023-10-27 18:50:54 +08:00
PC-202302260912\Administrator 788392feca 超值连充半成品 2023-10-20 11:34:23 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
wangzhenxing bb18772265 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2023-09-21 18:43:54 +08:00
xiejun d53329f6fb 灵兽部分UI 2023-09-21 18:36:44 +08:00
xiejun c47462c5d8 Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-09-20 18:57:44 +08:00
wangzhenxing 600f270128 礼物添加总属性显示,逍遥游寻仙修改 2023-09-19 18:03:00 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +08:00
wangzhenxing fdae5c1348 嘲讽图标修改 2023-09-06 10:31:10 +08:00
wangzhenxing 5314b7ccf6 添加嘲讽图标 2023-09-05 20:59:52 +08:00
PC-202302260912\Administrator 99bf06bd3b 魂印狂欢图标 2023-09-07 14:51:19 +08:00
wangzhenxing 52393c592c 命石提交 2023-08-31 15:02:13 +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 f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
wangzhenxing 4cbe612e03 新英雄 buff图标提示提交 2023-08-24 18:21:09 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
PC-202302260912\Administrator d0c184cc42 狂欢图标修改 2023-08-02 17:09:16 +08:00
wangzhenxing 073d87eda7 妖精累充banner图替换修改 2023-08-01 16:31:26 +08:00
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
PC-202302260912\Administrator 4e949b17b0 日常副本入口文字图片修改提交 2023-07-17 17:50:16 +08:00
PC-202302260912\Administrator addd9312da 玲珑商店图片资源提交 2023-07-14 14:29:52 +08:00
PC-202302260912\Administrator 08e1057cf6 月卡基金50倍图片修改提交 2023-07-14 13:58:47 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
PC-202302260912\Administrator 146c855499 超值基金按钮 2023-06-25 17:01:04 +08:00
PC-202302260912\Administrator 8419048c88 日常副本图片修改提交 2023-07-12 17:41:04 +08:00
PC-202302260912\Administrator 5838089889 七界试炼,灵脉秘境更换入口,日常任务副本只保留前两个
(cherry picked from commit 0646849c2f)
2023-06-28 15:50:22 +08:00
PC-202302260912\Administrator f97eb65108 召唤图标替换 2023-07-04 16:11:56 +08:00
xiejun b47c16dcb7 test 2023-06-20 18:01:51 +08:00