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 |
wangzhenxing
|
92d9d4a413
|
山河设计图提示修改
|
2023-08-02 15:44:43 +08:00 |
wangzhenxing
|
5ac2ed1220
|
山河设计图添加关卡提示
|
2023-07-24 11:31:36 +08:00 |
PC-202302260912\Administrator
|
6c6a7d19f7
|
山河社稷图提交开放章节提示
|
2023-06-14 18:12:47 +08:00 |
wangzhenxing
|
a9b13b206c
|
山河设计图添加开服时间限制
|
2023-06-02 16:09:28 +08:00 |
wangzhenxing
|
8badc5fcda
|
山河设计图第一次打开修改
|
2022-11-11 15:33:43 +08:00 |
jiaoyangna
|
7a1ccac3cd
|
【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
|
2022-04-02 14:45:12 +08:00 |
ZhangBiao
|
8f2398c932
|
【山河社稷图优化】优化选关界面操作
|
2021-11-02 17:22:42 +08:00 |
gaoxin
|
582ab51299
|
【山河社稷图】每日奖励文字修改
|
2021-10-22 21:25:49 +08:00 |
gaoxin
|
74f3c07aa4
|
【山河每日奖励】新增二次确认
|
2021-10-20 13:51:55 +08:00 |
gaoxin
|
e6af50143c
|
【山河社稷图】修复小人方向错误
|
2021-10-19 19:03:02 +08:00 |
gaoxin
|
e01b39c8a4
|
【山河每日奖励】优化宝箱显示
|
2021-10-19 18:01:50 +08:00 |
gaoxin
|
3c371623d7
|
【山河每日奖励】完善奖励领取逻辑
|
2021-10-19 17:07:32 +08:00 |
gaoxin
|
47d6de27ff
|
【山河社稷图】添加每日奖励按钮及领取逻辑添加
|
2021-10-18 18:06:47 +08:00 |
zhangqiang
|
18950a2326
|
【山河社稷图】章节图标修改
|
2021-06-10 14:43:45 +08:00 |
zhangqiang
|
05b55bce02
|
【山河社稷图读取关卡界面音乐】
|
2021-06-09 18:17:22 +08:00 |
zhangqiang
|
66c024eeae
|
【山河社稷图】bug
|
2021-05-26 20:47:41 +08:00 |
zhangqiang
|
9322a8489a
|
【提交】
|
2021-05-26 14:59:25 +08:00 |
zhangqiang
|
cb86e3efd4
|
【山河社稷图】
|
2021-05-21 19:07:46 +08:00 |
zhangqiang
|
029ea47266
|
【山河社稷图】图片加载
|
2021-05-19 17:36:43 +08:00 |
gaoxin
|
6d551869be
|
【内存优化】新内存内存优化修改
|
2021-05-19 15:06:02 +08:00 |
zhangqiang
|
78e1a2b5a4
|
【山河社稷图】提交
|
2021-05-15 16:16:46 +08:00 |
zhangqiang
|
57e1e32e32
|
【山河社稷图】提交
|
2021-05-14 15:03:48 +08:00 |
zhangqiang
|
e4eda3017e
|
【山河社稷图】提交
|
2021-05-13 20:30:10 +08:00 |
zhangqiang
|
da33b98dfb
|
【山河社稷图】提交
|
2021-05-13 09:56:11 +08:00 |
zhangqiang
|
effe90990f
|
【山河社稷图】提交
|
2021-05-11 15:12:37 +08:00 |
zhangqiang
|
1db33218d8
|
【山河社稷图】首提
|
2021-05-07 14:44:50 +08:00 |