wangzhenxing
|
fe86bacd77
|
[礼物]======礼物升星提交
|
2024-01-10 18:12:31 +08:00 |
wangzhenxing
|
1d584c8d68
|
Merge branch 'onepiece_demo' into onepiece_demo_dev
|
2024-01-04 11:27:30 +08:00 |
wangzhenxing
|
5fcd2ada66
|
主城主角名字 称号位置修改
|
2024-01-03 19:26:17 +08:00 |
xiejun
|
12380d2ffc
|
桌面角色title的问题
|
2024-01-03 18:31:08 +08:00 |
wangzhenxing
|
030431e3fc
|
合并0.1新功能修改
|
2024-01-03 15:24:49 +08:00 |
wangzhenxing
|
c3334a5d98
|
更换名称
|
2023-12-07 01:11:27 +08:00 |
wangzhenxing
|
8f9dde46ec
|
主城修改提交
|
2023-12-05 19:37:05 +08:00 |
wangzhenxing
|
080023c58c
|
主城小人修改
|
2023-12-05 19:26:08 +08:00 |
xiejun
|
9f64b30380
|
主城角色移动修改
|
2023-12-05 14:59:31 +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 |
wangzhenxing
|
d9baf95138
|
主城添加每日好礼
|
2023-01-16 16:33:28 +08:00 |
wangzhenxing
|
260db13451
|
超值基金,热榜红点提交
|
2023-01-16 14:37:14 +08:00 |
wangzhenxing
|
286e8c0839
|
我是gm 红点提交
|
2022-12-30 15:08:22 +08:00 |
yuanshuai
|
22ca5ed37b
|
锻器阁未开启飘字
|
2022-12-23 18:23:15 +08:00 |
wangzhenxing
|
7109e86706
|
英雄热榜提交
|
2022-12-13 16:06:12 +08:00 |
wangzhenxing
|
e1ee0827c0
|
【主城】========鸿蒙阵按钮new状态修改
|
2022-12-06 17:23:35 +08:00 |
wangzhenxing
|
669de51788
|
主城界面修改提交
|
2022-12-06 17:12:03 +08:00 |
wangzhenxing
|
214b316ac9
|
[bt]========主城鸿蒙镇修改提交
|
2022-12-01 14:24:05 +08:00 |
wangzhenxing
|
5c49a471da
|
[gm]====送10万充提交
|
2022-11-28 18:40:45 +08:00 |
yuanshuai
|
4b10be80c9
|
主城神尊名望特权添加特效
|
2022-11-17 14:21:56 +08:00 |
wangzhenxing
|
e7f973409e
|
主城屏蔽天书密卷入口
|
2022-11-14 16:16:50 +08:00 |
yuanshuai
|
551ed6c64f
|
Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt
|
2022-11-10 13:53:01 +08:00 |
yuanshuai
|
83df159d3f
|
神尊红点bug修改
|
2022-11-10 13:52:48 +08:00 |
wangzhenxing
|
d6ada9958a
|
gm购买提示修改
|
2022-11-10 13:45:03 +08:00 |