Commit Graph

387 Commits (89cc2595e1b8d77d5f7146eee0b4b4c70d53e6da)

Author SHA1 Message Date
PC-202302260912\Administrator 710ef8af04 优化页面 2024-12-18 16:27:07 +08:00
PC-202302260912\Administrator cecc1fda58 预设修改 2024-09-14 13:34:20 +08:00
PC-202302260912\Administrator 971ba9b2a5 替换文字 2024-09-12 19:29:03 +08:00
PC-202302260912\Administrator 0b3cb6df94 生命卡修改为意念 预设修改 2024-09-12 18:34:47 +08:00
PC-202302260912\Administrator 4ab52a68c5 修改预设titilebg 2024-09-11 21:30:46 +08:00
PC-202302260912\Administrator 64fb5c4140 添加图标修改预设 2024-09-11 21:25:45 +08:00
PC-202302260912\Administrator dec4c5fe46 优化一部分页面 2024-09-09 21:11:16 +08:00
PC-202302260912\Administrator 78e2e6a8da 圣器改为神龙 2024-09-09 18:03:32 +08:00
PC-202302260912\Administrator 7e7b86d35e 阵营命修改 上传一部分杂乱的mat 2024-09-06 19:30:37 +08:00
PC-202302260912\Administrator cb9803057b 关卡界面优化 2024-07-17 18:22:41 +08:00
PC-202302260912\Administrator d191963c03 优化页面 2024-07-31 18:59:25 +08:00
PC-202302260912\Administrator 3bcd61dae8 轩辕相关 2024-07-16 11:47:47 +08:00
PC-202302260912\Administrator 33d3112995 轩辕相关 2024-07-16 11:45:25 +08:00
PC-202302260912\Administrator d5b40941f5 轩辕 2024-07-10 11:00:37 +08:00
PC-202302260912\Administrator 704ba56df5 轩辕页面修改 2024-07-09 19:37:08 +08:00
PC-202302260912\Administrator 3fa1cdcd7e 战斗页面修改 2024-07-14 16:45:49 +08:00
PC-202302260912\Administrator f37ca45460 修行挑战页面修改 2024-07-19 17:37:13 +08:00
PC-202302260912\Administrator c1fe29e734 轩辕修改 2024-03-31 14:28:37 +08:00
PC-202302260912\Administrator 0010ff04ea 优化页面 2024-03-31 15:41:25 +08:00
PC-202302260912\Administrator ec0e0637c1 修改页面 2024-03-26 14:18:14 +08:00
PC-202302260912\Administrator 8eac324dc2 修改图片 2024-03-25 19:10:35 +08:00
xiejun f28e20ade1 描述 2024-02-02 18:37:33 +08:00
wangzhenxing 859bdec4ed 和之国寻宝修改 2024-02-02 11:44:47 +08:00
xiejun 37191e7d3c 四皇宝藏混乱 2024-01-30 11:49:52 +08:00
xiejun e602cb5ff0 修改海上夺宝的描述 2024-01-25 16:47:22 +08:00
xiejun bce0465aa3 修改开服狂欢 2024-01-20 22:51:26 +08:00
wangzhenxing f926dce29c 副本修改 2024-01-20 20:53:38 +08:00
xiejun ac384ba7fc 修改底部图标 2024-01-20 16:01:31 +08:00
wangzhenxing a929fb7e40 伤害防御副本修改提交 2024-01-17 18:00:34 +08:00
xiejun 59d46cc151 副本的空岛按钮调整 2024-01-11 14:41:37 +08:00
wangzhenxing 030431e3fc 合并0.1新功能修改 2024-01-03 15:24:49 +08:00
xiejun 1b8a1a2480 bug修改 2023-12-27 19:05:37 +08:00
xiejun 04dcb81b8a 修改四海副本的UI 2023-12-11 16:14:28 +08:00
wangzhenxing 63e9a01c73 法宝改成生命卡 2023-12-08 21:57:53 +08:00
wangzhenxing e4299072f4 名称替换 2023-12-07 00:09:44 +08:00
wangzhenxing 902e27918f 活动按钮修改 2023-11-15 17:19:43 +08:00
xiejun 07e72f4829 修改ExpeditionMonsterInfoPopup预制体 2023-11-14 17:12:24 +08:00
xiejun 6c95c05b6c 和之国寻宝预制体修改 2023-11-11 17:11:23 +08:00
xiejun 445bdaac11 金币经验副本的选中框和标题字体调整 2023-11-11 16:51:05 +08:00
xiejun 1e3ef6f5a3 副本名称和战斗位置 2023-11-08 18:18:47 +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
xiejun 3ab79a59b7 副本UI 2023-09-02 18:53:21 +08:00
xiejun 5b8ef487f7 御灵 2023-09-02 17:16:34 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +08:00
wangzhenxing 0dddc2ef7c 轩辕宝镜修改
(cherry picked from commit f838e2d0f2)
2023-08-30 10:35:11 +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
wangzhenxing cda1bc9893 灵脉秘境置灰能进入问题修改 2023-07-31 17:56:30 +08:00
PC-202302260912\Administrator 4a15931ce1 【七界试炼】======入口提示修改 2023-07-07 15:51:59 +08:00
PC-202302260912\Administrator 5838089889 七界试炼,灵脉秘境更换入口,日常任务副本只保留前两个
(cherry picked from commit 0646849c2f)
2023-06-28 15:50:22 +08:00
wangzhenxing 09ea7051f0 屏蔽大闹天宫,森罗幻境 2023-05-30 10:26:42 +08:00