Commit Graph

107 Commits (1212678fdb31dcf827cb6699db45d1ae64c676db)

Author SHA1 Message Date
wangzhenxing e1d776e741 删除不用资源 2024-02-07 16:12:03 +08:00
wangzhenxing b7c7632729 删除无用资源 2024-01-24 19:00:58 +08:00
wangzhenxing c67c9a9141 删除无用资源 2024-01-24 11:43:20 +08:00
wangzhenxing 9a45b6e831 删除老图片资源 2024-01-17 10:56:01 +08:00
wangzhenxing 2f160b4e67 挂机界面修改 2023-11-03 14:21:13 +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 99bf06bd3b 魂印狂欢图标 2023-09-07 14:51:19 +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
PC-202302260912\Administrator d0c184cc42 狂欢图标修改 2023-08-02 17:09:16 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
lihaiyang f595ebee5b 修改称号等美术图标 2023-06-02 13:18:06 +08:00
wangzhenxing c31676ff43 每日豪礼图片修改提交 2023-01-16 17:24:44 +08:00
wangzhenxing 119c186c34 [主城]=======按钮修改提交 2022-11-08 14:51:51 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
yuanshuai 552ea8ec0e 建木神树icon修改 2022-09-06 18:29:30 +08:00
luyao 1f1344deff 神灵试炼 功能预告图标 2022-07-21 15:18:52 +08:00
wangzhenxing 5535d7df71 [首充]=====首充修改 2022-07-12 18:25:50 +08:00
wangzhenxing d6992ae3a9 [首充]======入口图标修改提交 2022-06-07 16:55:35 +08:00
yuanshuai c9dfe177e6 百抽派送活动提交 2022-05-17 13:23:15 +08:00
luyao f82f6cbbd9 神印、挑战副本预告图标 2022-04-24 19:01:36 +08:00
yuanshuai c5b0d30f9c 资源提交 2022-04-19 13:39:48 +08:00
张彪 6044ee2828 【战力冲刺】图标提交 2022-02-18 18:11:18 +08:00
ZhangBiao c373f8d014 【修改】提交 2022-01-15 15:05:26 +08:00
ZhangBiao f4c1b9d097 【修改】提交 2022-01-15 14:34:55 +08:00
luyao 352de7108e 【神将头像朝向修改左>右】 2021-11-27 16:45:05 +08:00
ZhangBiao 7e1039bf3b 【灵脉秘境】特效 2021-11-26 15:43:39 +08:00
ZhangBiao 8da0a81588 【寻仙抽】提交 2021-11-25 15:59:31 +08:00
jiaoyangna 84ee79fd1e meta 文件提交 2021-11-04 12:15:48 +08:00
gaoxin c080345afc 【积天豪礼】主界面按钮资源上传 2021-11-10 01:01:05 +08:00
ZhangBiao 4eb6e1d9ae 【御剑行】提交 2021-10-14 11:25:44 +08:00
ZhangBiao f90babe2e8 Revert "Revert "【山河试炼】界面提交""
This reverts commit 3dc9dd5d64.
2021-07-14 11:30:35 +08:00
jiaoyangna 5531dca914 【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置,增加特效突出效果

(cherry picked from commit eaf814bbfa)
2021-07-09 18:22:52 +08:00
ZhangBiao f2dd26a329 【特惠神装】icon调整 2021-07-02 13:50:56 +08:00
ZhangBiao a37fd67704 【特惠神装】基本完成 2021-07-01 19:56:28 +08:00
ZhangBiao 683964cd8a 【惊喜礼盒】资源更换 2021-06-18 17:52:09 +08:00
ZhangBiao 54bc0f2caa 【惊喜礼盒】提价 2021-06-17 15:26:10 +08:00
gaoxin 3dc9dd5d64 Revert "【山河试炼】界面提交"
This reverts commit fbc5316b01.
2021-06-16 10:09:04 +08:00
ZhangBiao fbc5316b01 【山河试炼】界面提交 2021-06-15 14:25:22 +08:00
ZhangBiao 6152c52f2c 【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容 2021-06-15 10:22:32 +08:00
JieLing 530374e00b 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
gaoxin a10d34b076 【逐胜之巅】入口资源添加文字 2021-06-09 18:18:35 +08:00
gaoxin 5a54f51107 【主界面】逐胜之巅资源替换 2021-06-09 15:00:49 +08:00
gaoxin 51eb62af65 【资源】新增一批功能提示按钮 2021-06-03 13:57:40 +08:00
gaoxin 4d757a84d8 【资源】添加逍遥游预告icon 2021-06-02 20:25:50 +08:00
ZhangBiao 4cc35be589 【牛气冲天】界面按钮调整 2021-06-02 20:11:37 +08:00
gaoxin 081ff4c0d8 【资源】修行和困难副本预告图标上传 2021-05-31 19:20:37 +08:00
gaoxin 05c3f30a7f 【资源】主界面活动按钮优化 2021-05-28 15:53:40 +08:00
ZhangBiao 4af21bc33d 【幸运探宝】进度条奖励包装显示修改 2021-05-28 15:11:57 +08:00
gaoxin 30372368f6 【资源】特惠商城资源格式修改 2021-05-19 17:11:37 +08:00
gaoxin 73f476a4e8 【资源】重复资源删除 2021-05-19 14:26:37 +08:00