PC-202302260912\Administrator
|
b5e8846e41
|
主界面优化
|
2024-12-13 15:31:51 +08:00 |
zhangjiannan
|
19484d6b62
|
Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
# Assets/ManagedResources/Icon/Haizeiskill.meta
# Assets/ManagedResources/Icons/luofu_huobi_1.png
# Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_2.png
# Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_3.png
# Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_4.png
# Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
# Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
# Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
# Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
|
2024-10-11 16:36:50 +08:00 |
PC-202302260912\Administrator
|
56ac16a528
|
优化页面 点将台修改伙伴招募
|
2024-09-16 11:55:15 +08:00 |
wangzhenxing
|
2bdca04710
|
基金修改
|
2024-06-12 18:22:17 +08:00 |
wangzhenxing
|
eb2f921aab
|
不显示gm修改器
|
2024-06-12 18:26:31 +08:00 |
wangzhenxing
|
87b90cbbdc
|
Revert "福利入口移到gm修改器下面"
This reverts commit 8736b07d08 .
|
2024-05-22 12:29:30 +08:00 |
wangzhenxing
|
8736b07d08
|
福利入口移到gm修改器下面
|
2024-05-22 11:31:22 +08:00 |
wangzhenxing
|
cbcfc70ea3
|
主城大剑豪添加红点
|
2024-05-21 16:37:38 +08:00 |
wangzhenxing
|
c27bf67f92
|
gm修改提交
|
2024-02-22 15:01:18 +08:00 |
wangzhenxing
|
2e72d21ba9
|
主城显示gm修改器
|
2024-02-22 14:21:15 +08:00 |
wangzhenxing
|
ee3d72592d
|
主城修改
|
2024-02-22 13:14:04 +08:00 |
wangzhenxing
|
a578fb63ae
|
天下第一界面提交
|
2024-02-06 18:24:11 +08:00 |
wangzhenxing
|
a54bb36ccc
|
百抽活动修改
|
2024-01-25 18:51:09 +08:00 |
wangzhenxing
|
7a23e4cc8d
|
主城分解红点修改提交
|
2024-01-24 17:01:00 +08:00 |
wangzhenxing
|
372367ac5e
|
主城人物段位图标隐藏
|
2024-01-22 19:11:54 +08:00 |
wangzhenxing
|
06bc8ab767
|
主城引导修改
|
2024-01-22 17:13:39 +08:00 |
wangzhenxing
|
8a170778b8
|
主城新字修改
|
2024-01-20 22:51:20 +08:00 |
xiejun
|
021c011b99
|
主界面修改
|
2024-01-20 20:59:29 +08:00 |
wangzhenxing
|
808950b6a8
|
主界面添加鸿蒙阵入口图标
|
2024-01-19 14:25:04 +08:00 |
wangzhenxing
|
84e96e18a1
|
名刀 圣器入口位置调整
|
2024-01-18 21:14:44 +08:00 |
wangzhenxing
|
fe86bacd77
|
[礼物]======礼物升星提交
|
2024-01-10 18:12:31 +08:00 |
wangzhenxing
|
030431e3fc
|
合并0.1新功能修改
|
2024-01-03 15:24:49 +08:00 |
wangzhenxing
|
8f9dde46ec
|
主城修改提交
|
2023-12-05 19:37:05 +08:00 |
wangzhenxing
|
9b600f9f85
|
灵兽功能入口屏蔽
|
2023-12-04 17:36:53 +08:00 |
wangzhenxing
|
fe14155802
|
特训建筑修改
|
2023-11-24 11:46:47 +08:00 |
wangzhenxing
|
db821399a1
|
特训建筑提交
|
2023-11-22 19:20:42 +08:00 |
wangzhenxing
|
5f191e29cb
|
特训提交
|
2023-11-21 17:26:43 +08:00 |
wangzhenxing
|
f580db9af8
|
图鉴修改提交
|
2023-11-11 16:13:52 +08:00 |
wangzhenxing
|
8da4412a87
|
主城预设 修改提交
|
2023-11-08 13:55:38 +08:00 |
wangzhenxing
|
6c2a9c4a84
|
主城界面修改
|
2023-11-07 18:14:22 +08:00 |
wangzhenxing
|
b20e6361b2
|
主界面修改提交
|
2023-11-03 19:16:16 +08:00 |
wangzhenxing
|
0d2638355a
|
主界面修改
|
2023-11-03 15:46:07 +08:00 |
wangzhenxing
|
c67eb7f7ad
|
神兵系统界面修改提交
|
2023-11-02 16:03:11 +08:00 |
xiejun
|
e1d0445714
|
修改bug,删除部分老预设
|
2023-10-23 17:44:09 +08:00 |
xiejun
|
d45dbb9679
|
屏蔽两个活动按钮
|
2023-10-20 17:00:49 +08:00 |
wangzhenxing
|
546e6d4627
|
主城屏蔽鸿蒙阵入口,英雄属性信息去掉公会技能入口
|
2023-10-11 11:24:32 +08:00 |
xiejun
|
b6bf5409f1
|
修改合并后的bug
|
2023-09-21 17:04:24 +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
|
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 |
xiejun
|
43d80275b9
|
神将部分UI替换
|
2023-08-04 18:58:14 +08:00 |
xiejun
|
fd8329bf90
|
海贼UI
|
2023-07-27 18:37:04 +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
|
02a2374c53
|
主城=======洞府,跨服战入口屏蔽,灵兽山位置修改
|
2023-07-12 18:23:39 +08:00 |
wangzhenxing
|
f4aeeacc4d
|
主城屏蔽gm修改器
|
2023-05-29 17:17:24 +08:00 |
wangzhenxing
|
6d3fe931d3
|
[神兵]==============修改提交
|
2023-04-12 11:31:04 +08:00 |
yuanshuai
|
a7ccff7ff1
|
神兵功能优化
|
2023-04-06 18:13:54 +08:00 |
yuanshuai
|
31f51cca80
|
神兵红点提交
|
2023-04-04 18:21:14 +08:00 |
wangzhenxing
|
826f58ce6e
|
神兵提交
|
2023-03-28 13:57:59 +08:00 |