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
|
88740201b3
|
排行榜UI
|
2023-09-20 18:00:40 +08:00 |
xiejun
|
5c4e04a1be
|
修改代码
|
2023-09-19 18:56:46 +08:00 |
xiejun
|
af6b341a0c
|
修改子弹逻辑
|
2023-09-18 15:41:32 +08:00 |
wangzhenxing
|
551579ca39
|
星际显示添加空判断
(cherry picked from commit fd5cd6836c )
|
2023-09-15 18:02:50 +08:00 |
wangzhenxing
|
51003c0c8c
|
灵兽升星修改
|
2023-09-15 15:15:11 +08:00 |
wangzhenxing
|
e3a8cd725f
|
合并冲突提交
|
2023-09-15 14:24:03 +08:00 |
wangzhenxing
|
14ce1fedbd
|
时空神将推荐阵容显示修改提交
(cherry picked from commit 883f9af02e )
|
2023-09-15 14:18:47 +08:00 |
wangzhenxing
|
51dc91cbda
|
[战斗]=======================效果162 提交
(cherry picked from commit 56736a3aca )
|
2023-09-15 14:18:14 +08:00 |
xiejun
|
ccb0cd4838
|
修改混乱之后角色不行动的BUG
|
2023-09-11 17:59:32 +08:00 |
wangzhenxing
|
b2e7822bf1
|
【战斗】===============效果10修改提交
|
2023-09-08 14:09:13 +08:00 |
wangzhenxing
|
4b34e64de7
|
工会开启 工会技能
|
2023-09-06 15:11:01 +08:00 |
wangzhenxing
|
6085b2193a
|
多对塔挑战修改
|
2023-09-06 14:43:33 +08:00 |
wangzhenxing
|
2a5188a8fc
|
协议提交
|
2023-09-05 14:55:38 +08:00 |
wangzhenxing
|
db3b8d9562
|
【战斗】====================被动添加479
|
2023-09-04 18:45:16 +08:00 |
xiejun
|
363b5a3818
|
图鉴UI
|
2023-09-04 18:27:40 +08:00 |
wangzhenxing
|
c889e67a43
|
英雄属性详情界面去除工会技能跳转
|
2023-09-04 16:57:01 +08:00 |
xiejun
|
731ca32f5b
|
修改BUG
|
2023-09-04 15:40:11 +08:00 |
xiejun
|
3993a248c0
|
修改bUG
|
2023-09-04 15:21:09 +08:00 |
xiejun
|
3ab79a59b7
|
副本UI
|
2023-09-02 18:53:21 +08:00 |
xiejun
|
5b8ef487f7
|
御灵
|
2023-09-02 17:16:34 +08:00 |
wangzhenxing
|
241fda7f84
|
命石修改提交
|
2023-09-02 12:28:14 +08:00 |
wangzhenxing
|
c39a4e1fcc
|
命石修改提交
|
2023-09-01 23:41:45 +08:00 |
xiejun
|
1a34fec66e
|
修复bug
|
2023-09-01 20:18:46 +08:00 |
wangzhenxing
|
f792ab4c7d
|
命石修改
|
2023-09-01 19:35:49 +08:00 |
wangzhenxing
|
1318c74f59
|
红点修改提交
|
2023-09-01 19:26:54 +08:00 |
wangzhenxing
|
c9418f9821
|
命石奖励预设修改
|
2023-09-01 19:01:33 +08:00 |
wangzhenxing
|
3ac8d1ee2c
|
魂印图鉴修改提交
|
2023-09-01 18:48:59 +08:00 |
wangzhenxing
|
ffaab0f625
|
命石飘战力提交
|
2023-09-01 18:29:25 +08:00 |
xiejun
|
83a8e9ab56
|
修改
|
2023-09-01 18:27:39 +08:00 |
wangzhenxing
|
55f0c6d3e6
|
魂印图鉴修改 ,命石修改
|
2023-09-01 18:04:52 +08:00 |
wangzhenxing
|
2b93776f7c
|
命格修改提交
|
2023-09-01 17:36:15 +08:00 |
wangzhenxing
|
0e083205a3
|
命格修改提交
|
2023-09-01 12:34:34 +08:00 |
wangzhenxing
|
18e10b4fb6
|
命格修改提交
|
2023-08-31 19:12:02 +08:00 |
wangzhenxing
|
5e1cc83b2a
|
命石修改提交
|
2023-08-31 15:20:27 +08:00 |
wangzhenxing
|
52393c592c
|
命石提交
|
2023-08-31 15:02:13 +08:00 |
wangzhenxing
|
e0cd811e75
|
百抽活动去掉时间显示
|
2023-08-31 10:31:27 +08:00 |
xiejun
|
837e769c14
|
七界
|
2023-08-30 22:07:43 +08:00 |
xiejun
|
e50aa15b47
|
修改代码
|
2023-08-30 21:33:02 +08:00 |
xiejun
|
f42141a40e
|
修改灵兽代码
|
2023-08-30 21:31:29 +08:00 |
xiejun
|
87c1193f8b
|
修改BUG
|
2023-08-30 21:25:36 +08:00 |
xiejun
|
f1b9b526c1
|
代码修改
|
2023-08-30 20:33:29 +08:00 |
wangzhenxing
|
f9774fd187
|
百抽活动修改提交,最多只显示七天奖励
|
2023-08-29 18:58:09 +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
|
f838e2d0f2
|
轩辕宝镜修改
|
2023-08-29 15:21:53 +08:00 |
xiejun
|
4d8b08104c
|
七界资源
|
2023-08-28 18:52:15 +08:00 |
wangzhenxing
|
4ade868f90
|
抽卡去掉妖精限制提示
|
2023-08-28 14:04:41 +08:00 |
xiejun
|
f549956ebb
|
新预制体已经公会和活动ui
|
2023-08-28 11:34:43 +08:00 |
wangzhenxing
|
595487091b
|
【战斗】=======battlelogic修改
|
2023-08-25 18:58:32 +08:00 |