Commit Graph

196 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)

Author SHA1 Message Date
wangzhenxing ed6d904661 删除无用图片 2024-01-12 14:34:44 +08:00
xiejun cee660230b 修改bug 2024-01-04 17:07:44 +08:00
wangzhenxing 47024e7b57 删除技能名称图片 2023-12-04 14:28:28 +08:00
wangzhenxing 815155b2bf 删除无用spine 2023-11-16 16:20:33 +08:00
wangzhenxing bb9243ea25 请求界面修改 2023-11-16 15:33:54 +08:00
wangzhenxing 88e7d006c5 删除无用图片 2023-11-14 17:13:20 +08:00
wangzhenxing 31718ea87d 主界面修改升级界面修改 2023-11-09 15:35:38 +08:00
wangzhenxing b00f874236 点石成金修改提交 2023-11-09 10:52:24 +08:00
wangzhenxing 8223d041f9 聊天界面修改 2023-11-08 15:52:49 +08:00
wangzhenxing 0d2638355a 主界面修改 2023-11-03 15:46:07 +08:00
wangzhenxing 90134677d2 急速探索界面修改提交 2023-11-03 11:42:57 +08:00
wangzhenxing 9d6308c909 法宝聚灵界面修改提交 2023-10-31 14:38:02 +08:00
xiejun 44e3f87d2c 背包资源 2023-10-27 18:50:54 +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
PC-202302260912\Administrator 83eea07584 牛气冲天图片修正 2023-09-04 19:03:24 +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 fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
PC-202302260912\Administrator 04fc28856d 关卡奖励提示图片文字修改提交 2023-07-17 11:03:51 +08:00
xiejun ab6a726b3a 增加凯多角色 2023-07-02 21:52:32 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
PC-202302260912\Administrator 8419048c88 日常副本图片修改提交 2023-07-12 17:41:04 +08:00
lihaiyang 63fc1c6ee2 【天蓬】图标 2023-05-16 11:49:23 +08:00
lihaiyang ca935de5b9 悟空 技能字 2023-04-21 13:25:09 +08:00
lihaiyang 330fe63d9f 女娲相关 2023-02-28 18:14:52 +08:00
wangzhenxing 689ebec257 关卡奖励图标适配 2022-11-17 10:50:37 +08:00
lihaiyang 98f68504bc 【挑战副本】======修正描述 2022-11-15 14:03:56 +08:00
lihaiyang a6929bab54 【防御挑战】======防御挑战图标上传 2022-11-14 17:46:04 +08:00
wangzhenxing 119c186c34 [主城]=======按钮修改提交 2022-11-08 14:51:51 +08:00
lihaiyang 85e9632df7 【刷冲特权】============布局修改 2022-11-02 19:06:25 +08:00
wangzhenxing cfb70c9a9e 【成长基金】======图片修改提交 2022-07-12 17:15:18 +08:00
wangzhenxing 504da04293 [英雄信息界面]=======底图修改 2022-06-06 10:52:55 +08:00
wangzhenxing dd7a256469 [周卡]======红点修改提交 2022-06-01 14:50:08 +08:00
luyao 6d745faedf 神将界面衬底图2 2022-06-01 10:57:23 +08:00
wangzhenxing aab17e8323 图片修改提交 2022-05-09 18:41:55 +08:00
yuanshuai 5f40aab195 图片修改 2022-04-24 20:33:30 +08:00
luyao 4cee830a53 新图标、UI资源、meta文件上传 2022-04-22 16:29:09 +08:00
luyao 6a7b4263a7 聊天底图(变浅色) 2022-04-22 12:45:03 +08:00
luyao 9e97f77090 聊天衬底图更新 2022-04-22 12:43:29 +08:00
yuanshuai c5b0d30f9c 资源提交 2022-04-19 13:39:48 +08:00
gaoxin 67c855ad56 【资源】特惠商城资源替换 2022-02-23 18:36:30 +08:00
ZhangBiao 60df01190d 【家园】资源替换 2022-01-18 15:19:19 +08:00
ZhangBiao cbea9006b3 【家园】资源替换 2022-01-14 17:38:46 +08:00
ZhangBiao 617a557071 【家园】修改按钮 2022-01-11 18:20:12 +08:00
gaoxin 978d4acb4e 【限时升星】资源上传 2022-01-14 10:48:24 +08:00
ZhangBiao bd2d5ccd50 【家园】提交 2021-12-30 20:24:59 +08:00
ZhangBiao 0d11371d87 【资源冲突】资源名修改提交 2021-12-06 16:15:24 +08:00
luyao a9ecbeaddd 方寸商店meta文件。及 牛魔王【气冲斗牛】技能字 2021-12-06 13:40:25 +08:00
wangzhenxing ac32149aa8 [立绘朝向]=====皮肤,敌方立绘朝向修改 2021-11-29 17:07:28 +08:00
ZhangBiao bb7c738cd1 【每日礼包】banner修改 2021-11-26 17:26:30 +08:00