Commit Graph

234 Commits (70a04e965a1fdcd4b27d8a4855ccbe16a17bcb93)

Author SHA1 Message Date
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 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 b8a15b703b 礼物特效层级修改提交 2023-09-20 16:33:01 +08:00
wangzhenxing c39a4e1fcc 命石修改提交 2023-09-01 23:41:45 +08:00
wangzhenxing ffaab0f625 命石飘战力提交 2023-09-01 18:29:25 +08:00
wangzhenxing 2b93776f7c 命格修改提交 2023-09-01 17:36:15 +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 fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
PC-202302260912\Administrator 49958d7b10 背包==================屏蔽魂印,变身,聚灵按钮 2023-07-13 17:01:05 +08:00
wangzhenxing b22a8d6975 新手开启新手引导 2023-06-12 14:31:23 +08:00
wangzhenxing 1f94c3d234 变身卡添加职业 2023-04-21 13:24:26 +08:00
wangzhenxing 3f8a00cb14 [神兵]==================修改提交 2023-04-11 14:41:36 +08:00
wangzhenxing 12e2cecaa1 神兵属性,神兵羁绊,神兵分解提交 2023-04-04 11:15:32 +08:00
wangzhenxing 826f58ce6e 神兵提交 2023-03-28 13:57:59 +08:00
wangzhenxing b1e56c1280 获取宝物法相展示修改提交 2023-02-21 15:25:14 +08:00
wangzhenxing 7f20d17b42 法相背包显示修改 2023-02-20 17:58:28 +08:00
yuanshuai 9fecd102e9 法相背包显示修改 2023-02-20 10:59:12 +08:00
wangzhenxing 726b53355e 法相背包修改提交 2023-02-19 21:21:45 +08:00
yuanshuai c2f2f9255b 法相修改提交 2023-02-18 15:52:52 +08:00
wangzhenxing 0b6d8ab978 法相提交 2023-02-17 19:43:00 +08:00
wangzhenxing 3a4a24c725 英雄升级资源包添加排序 2022-11-15 16:16:43 +08:00
wangzhenxing 3a952c6753 英雄培养优化 2022-11-15 15:57:48 +08:00
wangzhenxing d11e4a90cc 英雄升级突破材料不足提示 2022-11-04 16:28:16 +08:00
wangzhenxing ddc23a9319 [gm]======背包使用添加类型 2022-11-01 10:09:17 +08:00
wangzhenxing a0e830b025 [bt]======变身卡碎片显示修改 2022-10-21 10:25:10 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
wangzhenxing f1c0a2fcd8 [背包]====直冲卡添加使用 2022-09-23 15:50:28 +08:00
wangzhenxing efe732d91d [gm]=============刷冲特权提交 2022-09-23 15:24:10 +08:00
wangzhenxing fdaec2ac28 [gm修改器]=====提交 2022-09-20 17:04:48 +08:00
yuanshuai e3f58fbbec 物品神应等级显示 2022-09-07 15:25:36 +08:00
wangzhenxing 44787f9e58 [背包]======背包提交法宝页签 2022-08-30 18:10:07 +08:00
wangzhenxing ceefbf5c42 [背包]=====碎片合成按钮显示修改 2022-08-17 17:25:45 +08:00
wangzhenxing 4d59e2b852 [背包]====装备碎片显示修改 2022-08-16 16:36:09 +08:00
wangzhenxing e19570f43f [背包]======背包页签位置修改 2022-08-11 15:13:26 +08:00
wangzhenxing 06ba097de4 [背包]=========装备碎片提交 2022-08-11 11:19:05 +08:00
wangzhenxing a37d9fb93a 【背包碎片合成】======添加好感度碎片 2022-08-10 14:50:27 +08:00
wangzhenxing 5120ccdf8c [法宝背包显示修改]======== 2022-08-10 13:46:01 +08:00
wangzhenxing 5d41ecc114 【装备】======添加蓝白装备 2022-06-14 15:58:18 +08:00
yuanshuai 1e6d693209 山河设计图分页请求修改 2022-05-05 16:46:33 +08:00
yuanshuai d1111be7eb 化身卡升级升星红点提交 2022-04-27 18:08:55 +08:00
wangzhenxing 81122369c6 bug修改提交 2022-04-26 16:09:21 +08:00
yuanshuai 8a7c4160f0 背包页签修改 2022-04-26 11:56:20 +08:00
yuanshuai f0cb395539 背包页签修改 2022-04-26 11:45:13 +08:00
wangzhenxing 139a2de8d2 背包描述修改 2022-04-25 20:06:16 +08:00
wangzhenxing 4fb96bca23 结算界面特效穿透问题修改 2022-04-24 18:27:53 +08:00
wangzhenxing e498661919 神印添加背包分解 2022-04-24 16:36:27 +08:00
yuanshuai 765134f4b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
2022-04-22 18:33:04 +08:00
yuanshuai c3919b7e82 变身卡强化相关代码提交 2022-04-22 18:24:33 +08:00